From 23c8ffcee1160579336187dcec707dd50df15e6f Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Wed, 26 Feb 2025 20:27:59 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(REQ-3300):=20=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visa/server/service/impl/ChangeRecordServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
index f889fb92..7a44b726 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
@@ -1591,7 +1591,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                         .findAny()
                         .ifPresent(m -> {
                             log.info("{} bill {} is related by {} visa {}", m.getBillType(), m.getBillId(), m.getVisaType(), m.getVisaId());
-                            throw new ServiceException(String.format("%s已被其他%s关联，请重新选择", m.getBillType().getDesc(), visaType.getDesc()));
+                            throw new ServiceException(String.format("%s已被其他%s单关联，请重新选择", m.getBillType().getDesc(), visaType.getDesc()));
                         }));
     }
 
@@ -1609,7 +1609,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                         .findAny()
                         .ifPresent(m -> {
                             log.info("{} bill {} is related by {} visa {}", m.getBillType(), m.getBillId(), m.getVisaType(), m.getVisaId());
-                            throw new ServiceException(String.format("%s已被其他%s关联，请重新选择", m.getBillType().getDesc(), visaType.getDesc()));
+                            throw new ServiceException(String.format("%s已被其他%s单关联，请重新选择", m.getBillType().getDesc(), visaType.getDesc()));
                         }));
     }
 

From 3b8acc5e2cafa32d45ece641029d45417dc82c33 Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Thu, 27 Feb 2025 10:12:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(REQ-3300):=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=80=81=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=89=B9=EF=BC=8C=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visa/server/service/impl/ChangeRecordServiceImpl.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
index 7a44b726..64fbb6a7 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
@@ -762,8 +762,14 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
     @Transactional(rollbackFor = Exception.class)
     public Long approveCreateVisaChangeRecord(VisaChangeApproveCreateReq req) {
         /*校验*/
-        validVisaChangeForm(req);
         ChangeRecord changeRecord = this.getById(req.getId());
+        if (NumberUtil.isPositiveNumber(changeRecord.getId())) {
+            // 编辑态下校验单据状态
+            AssertUtil.isTrue(!StringUtils.hasText(changeRecord.getApprovalId())
+                            || (StringUtils.hasText(changeRecord.getApprovalId()) && !Objects.equals(VisaStatusEnum.APPROVING.name(), changeRecord.getApprovalStatus())),
+                    "当前单据审批中，不允许操作");
+        }
+        validVisaChangeForm(req);
         ChangeRecord oldChangeRecord = BeanUtil.copyProperties(changeRecord, ChangeRecord.class);
         List<VisaDetailByIdResponse.VisaUploadFile> visaUploadFiles = this.buildAttachUploadFile(req.getId());
 

From dc9d02e5b2802f8e9ad1c878c0f55b2cb391e2af Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Thu, 27 Feb 2025 10:13:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat(REQ-3581)=20-=20=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0ouId=20=E5=92=8C=20workspaceID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mq/listener/im/ImGroupAddMembersEventHandler.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java
index 5df5d1d7..5aaf3f4e 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/im/ImGroupAddMembersEventHandler.java
@@ -91,7 +91,11 @@ public class ImGroupAddMembersEventHandler implements EventHandler, Initializing
                     "initiatorName", ownerProfile.getRealName(),
                     "visaType", StringUtils.isNotBlank(visaType) ? VisaTypeEnum.valueOf(visaType).getDesc() : "",
                     "topic", group.getName())));
-            notice.setRouterParams(new JSONObject(Maps.of("visaId", visaId)));
+            notice.setRouterParams(new JSONObject(Maps.of(
+                    "visaId", visaId,
+                    "ouId", member.getPersonOuId(),
+                    "workspaceId", workspaceId
+            )));
             noticeApi.send(notice);
         }
         log.info("receive add member event, push notice success!");