From 2ad07b7122851fcb9a68d17b79253f013079e8d1 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Fri, 21 Feb 2025 10:30:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(REQ-3300)=20-=20=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=B6=E7=9A=84=E5=8D=95=E6=8D=AE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/service/impl/ChangeRecordRelationServiceImpl.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/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
index 54d7eac9..6b86ef35 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
@@ -197,7 +197,8 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
         ChangeRecord record = changeRecordService.getById(req.getVisaId());
         AssertUtil.notNull(record, "未找到变洽签记录");
         AssertUtil.isTrue(Objects.equals(record.getImGroupId(), req.getImGroupId()), "IM 群信息不匹配");
-        AssertUtil.isTrue(Objects.equals(record.getStatus(), VisaStatusEnum.DECIDING), "单据未在决策中，已不支持该操作");
+        AssertUtil.isTrue(Objects.equals(VisaStatusEnum.APPROVING, record.getStatus())
+                || Objects.equals(VisaStatusEnum.COMPLETED, record.getStatus()), "当前单据状态下不允许操作");
 
         if (Boolean.TRUE.equals(req.getClearAll())) {
             deleteByVisaId(req.getVisaId(), Lists.newArrayList(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE));
@@ -368,7 +369,6 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
         }
 
 
-
     }
 
     @Override

From a66f315ef777a459d06da285385e994c6eba2290 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Fri, 21 Feb 2025 10:41:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-3300)=20-=20=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=B6=E7=9A=84=E5=8D=95=E6=8D=AE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ChangeRecordRelationServiceImpl.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
index 6b86ef35..e7610bf5 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
@@ -197,8 +197,8 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
         ChangeRecord record = changeRecordService.getById(req.getVisaId());
         AssertUtil.notNull(record, "未找到变洽签记录");
         AssertUtil.isTrue(Objects.equals(record.getImGroupId(), req.getImGroupId()), "IM 群信息不匹配");
-        AssertUtil.isTrue(Objects.equals(VisaStatusEnum.APPROVING, record.getStatus())
-                || Objects.equals(VisaStatusEnum.COMPLETED, record.getStatus()), "当前单据状态下不允许操作");
+        AssertUtil.isTrue(!Objects.equals(VisaStatusEnum.APPROVING, record.getStatus())
+                && !Objects.equals(VisaStatusEnum.COMPLETED, record.getStatus()), "当前单据状态下不允许操作");
 
         if (Boolean.TRUE.equals(req.getClearAll())) {
             deleteByVisaId(req.getVisaId(), Lists.newArrayList(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE));
@@ -325,8 +325,8 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
     @Transactional(rollbackFor = Exception.class)
     public void appendAttachment(ChangeRecordAppendAttachReq req) {
         ChangeRecord visa = changeRecordService.getById(req.getVisaId());
-        AssertUtil.isTrue(Objects.equals(VisaStatusEnum.APPROVING, visa.getStatus())
-                || Objects.equals(VisaStatusEnum.COMPLETED, visa.getStatus()), "当前单据状态下不允许操作");
+        AssertUtil.isTrue(!Objects.equals(VisaStatusEnum.APPROVING, visa.getStatus())
+                && !Objects.equals(VisaStatusEnum.COMPLETED, visa.getStatus()), "当前单据状态下不允许操作");
 
         AssertUtil.notNull(visa, "变洽签单据不存在");
         List<ChangeRecordRelation> existsAttach = findByCondition(VisaRelationDto.builder()