From 77e1151ce20c1374faca906283daa87c6cb79343 Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Fri, 21 Feb 2025 15:06:14 +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=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visa/api/request/VisaChangePageSearchReq.java        | 2 +-
 .../server/service/impl/ChangeRecordServiceImpl.java     | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangePageSearchReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangePageSearchReq.java
index 4940b625..f3002752 100644
--- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangePageSearchReq.java
+++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangePageSearchReq.java
@@ -131,7 +131,7 @@ public class VisaChangePageSearchReq {
     /**
      * 主单据类型
      * <p>
-     *     仅当{@code from}为{@link FromEnum#SELECT}时，该字段才有效
+     *     仅当{@code from}为{@link FromEnum#SELECT}且{@code needRelatedBill}为{@code true}时，该字段才有效且不能为空
      * </p>
      */
     private VisaTypeEnum visaType;
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 44dec4cb..3fd6eb03 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
@@ -1148,7 +1148,6 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
     private LambdaQueryChainWrapper<ChangeRecord> getFilter(VisaChangePageSearchReq filter) {
 
         LambdaQueryChainWrapper<ChangeRecord> queryChainWrapper = lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds())
                 .eq(Objects.nonNull(filter.getVisaId()), ChangeRecord::getId, filter.getVisaId())
                 .eq(NumberUtil.isPositiveNumber(filter.getWorkspaceId()), ChangeRecord::getRelationWorkspaceId, filter.getWorkspaceId())
                 .eq(Objects.nonNull(filter.getType()), ChangeRecord::getType, filter.getType())
@@ -1181,7 +1180,13 @@ 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.in(CollectionUtils.isNotEmpty(filter.getVisaIds()), ChangeRecord::getId, filter.getVisaIds());
         return queryChainWrapper;
     }
 
@@ -1422,7 +1427,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                     .peek(r -> {
                         AssertUtil.notNull(r.getType(), "相关单位类型错误");
                         AssertUtil.isTrue(NumberUtil.isPositiveNumber(r.getOuId()), "请选择" + r.getType().getDesc());
-                        AssertUtil.isTrue(NumberUtil.isPositiveNumber(r.getNodeId()), "请选择" + r.getType().getDesc());
+                        AssertUtil.isTrue(NumberUtil.isPositiveNumber(r.getNodeId()), "请选择" + r.getType().getDesc() + "确认人所属部门");
                         AssertUtil.isTrue(NumberUtil.isPositiveNumber(r.getPersonId()), "请选择" + r.getType().getDesc() + "确认人");
                     })
                     .collect(Collectors.groupingBy(VisaChangeTempCreateReq.RelationUnitAndPerson::getType));