From a58ba5e883ed7fc791efeaa0dcd0f43ea3050b10 Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Fri, 21 Feb 2025 16:24:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300):=20=E7=BC=96=E8=BE=91=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8B=E8=B0=83=E7=94=A8=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=BF=94=E5=9B=9E=E4=B8=8D=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/service/impl/ChangeRecordServiceImpl.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 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 0f52d356..6f79eb2c 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
@@ -103,7 +103,6 @@ import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.Pair;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -1202,11 +1201,9 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                     "WHEN STATUS = 'FORBIDED' THEN FALSE " +
                     "ELSE TRUE " +
                     "END");
-            // 编辑状态下调用单据选择器需要将已选的可能作废的单据返回
-            if (Objects.nonNull(filter.getVisaType())) {
-                queryChainWrapper.or().in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds());
-                return queryChainWrapper;
-            }
+            // 需要将已选的可能作废的单据返回
+            queryChainWrapper.or().in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds());
+            return queryChainWrapper;
         }
         queryChainWrapper.in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds());
         return queryChainWrapper;
@@ -1498,7 +1495,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                         AssertUtil.notEmpty(relationVisa, "关联的单据不存在");
                         relationVisa.forEach(r -> {
                             AssertUtil.isTrue(Objects.equals(r.getRelationWorkspaceId(), req.getRelationWorkspaceId()), "关联的单据所属项目不匹配");
-                            AssertUtil.isFalse(Objects.equals(r.getStatus(), VisaStatusEnum.TO_REPORT) || Objects.equals(r.getStatus(), VisaStatusEnum.FORBIDED), String.format("单据%s状态为%s，不允许被关联", r.getNo(), r.getStatus().getDesc()));
+                            AssertUtil.isFalse(Objects.equals(r.getStatus(), VisaStatusEnum.TO_REPORT) || Objects.equals(r.getStatus(), VisaStatusEnum.FORBIDED), String.format("%s单据%s状态为%s，不允许被关联", VisaBillTypeEnum.DESIGN_VISA.getDesc(), r.getNo(), r.getStatus().getDesc()));
                         });
                         validBillIfRelated(VisaBillTypeEnum.DESIGN_VISA, billIds, req.getType());
                     } else {
@@ -1633,6 +1630,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
 
     /**
      * 获取变更签证单关联的图纸
+     *
      * @param visaId 变更签证Id
      * @return 签证单关联的图纸批注
      */