From df7303568f88c7b1d00fe51859aeb89c476c69cb Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Mon, 17 Feb 2025 11:21:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3300):=20=E5=8D=95=E6=8D=AE=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E8=BF=87=E6=BB=A4=E4=B8=8D=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8D=95=E6=8D=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

数据过滤方案可能会导致分页存在每页不足数量的问题
---
 .../service/impl/ChangeRecordServiceImpl.java | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 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 99e1b066..8d5085b8 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
@@ -1050,6 +1050,15 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
         }
 
         queryChainWrapper.apply(" CASE WHEN status = 'TO_REPORT' THEN create_by = " + filter.getCurrentPersonId() + " else true end");
+
+        // 单据选择器调用需要过滤掉待提报和已废止的记录
+        if (Objects.nonNull(filter.getFrom()) && VisaChangePageSearchReq.FromEnum.SELECT.equals(filter.getFrom())) {
+            queryChainWrapper.apply("CASE " +
+                    "WHEN STATUS = 'TO_REPORT' THEN FALSE " +
+                    "WHEN STATUS = 'FORBIDED' THEN FALSE " +
+                    "ELSE TRUE " +
+                    "END");
+        }
         return queryChainWrapper;
     }
 
@@ -1148,7 +1157,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
         Map<Long, Set<VisaButtonTypeEnum>> operateBtnMap = visaHelper.fetchBtnsByBizTypeAndStatus(records, req.getCurrentPersonId(), req.getCurrentOuId(), req.getCurrentWorkspaceId());
 
         /*组装信息*/
-        List<VisaChangePageSearchResp> respList = records.stream()
+        return records.stream()
                 .map(r -> {
                     VisaChangePageSearchResp resp = BeanUtil.copyProperties(r, VisaChangePageSearchResp.class);
                     // 工程
@@ -1162,16 +1171,6 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
                     return resp;
                 })
                 .collect(Collectors.toList());
-
-        // 单据选择器调用需要过滤掉待报账和已废止的记录
-        if (CollectionUtils.isNotEmpty(respList) && Objects.nonNull(req.getFrom())
-                && VisaChangePageSearchReq.FromEnum.SELECT.equals(req.getFrom())) {
-            return respList.stream()
-                    .filter(r -> !VisaStatusEnum.TO_REPORT.equals(r.getStatus())
-                            && VisaStatusEnum.FORBIDED.equals(r.getStatus()))
-                    .collect(Collectors.toList());
-        }
-        return respList;
     }
 
     private Map<Long, String> getProjectInfoMapById(List<Long> projectIdList) {