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

---
 .../server/service/impl/ChangeRecordServiceImpl.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 6f79eb2c..e36c11ce 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
@@ -1196,14 +1196,16 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
 
         // 单据选择器调用需要过滤掉待提报和已废止的记录
         if (Objects.nonNull(filter.getFrom()) && VisaChangePageSearchReq.FromEnum.SELECT.equals(filter.getFrom())) {
-            queryChainWrapper.apply("CASE " +
+            // 编辑状态下调用单据选择器需要将已选的可能作废的单据返回
+            if (Objects.nonNull(filter.getVisaType())) {
+                queryChainWrapper.apply("CASE " +
                     "WHEN STATUS = 'TO_REPORT' THEN FALSE " +
                     "WHEN STATUS = 'FORBIDED' THEN FALSE " +
                     "ELSE TRUE " +
                     "END");
-            // 需要将已选的可能作废的单据返回
-            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;