From dafde8451eb673f455aa1f76a8a7cffaa106955c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 18 Oct 2023 14:20:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=96=AA=E8=AE=B0=E5=BD=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/biz/SalaryArchiveItemBiz.java      | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java
index 86351c9bc..b82cd7e81 100644
--- a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java
+++ b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java
@@ -176,19 +176,26 @@ public class SalaryArchiveItemBiz {
             SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class);
 
             List<Long> salaryArchiveIds = queryParam.getSalaryArchiveIds();
-            List<List<Long>> salaryArchiveIdsPartition = Lists.partition(salaryArchiveIds, 500);
-
-            List<SalaryItemAdjustRecordListDTO> salaryItemAdjustRecordListDTOS = new ArrayList<>();
-            salaryArchiveIdsPartition.forEach(l -> {
-                queryParam.setSalaryArchiveIds(l);
-                salaryItemAdjustRecordListDTOS.addAll(mapper.salaryItemAdjustRecordList(queryParam, salaryItemIds));
-            });
-
-            PageInfo<SalaryItemAdjustRecordListDTO> page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
-                    salaryItemAdjustRecordListDTOS,
-                    SalaryItemAdjustRecordListDTO.class);
-            encryptUtil.decryptList(page.getList(), SalaryItemAdjustRecordListDTO.class);
-            return page;
+            if (CollectionUtils.isEmpty(salaryArchiveIds)) {
+                List<SalaryItemAdjustRecordListDTO> salaryItemAdjustRecordListDTOS = mapper.salaryItemAdjustRecordList(queryParam, salaryItemIds);
+                PageInfo<SalaryItemAdjustRecordListDTO> page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+                        salaryItemAdjustRecordListDTOS,
+                        SalaryItemAdjustRecordListDTO.class);
+                encryptUtil.decryptList(page.getList(), SalaryItemAdjustRecordListDTO.class);
+                return page;
+            } else {
+                List<SalaryItemAdjustRecordListDTO> salaryItemAdjustRecordListDTOS = new ArrayList<>();
+                List<List<Long>> salaryArchiveIdsPartition = Lists.partition(salaryArchiveIds, 500);
+                salaryArchiveIdsPartition.forEach(l -> {
+                    queryParam.setSalaryArchiveIds(l);
+                    salaryItemAdjustRecordListDTOS.addAll(mapper.salaryItemAdjustRecordList(queryParam, salaryItemIds));
+                });
+                PageInfo<SalaryItemAdjustRecordListDTO> page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
+                        salaryItemAdjustRecordListDTOS,
+                        SalaryItemAdjustRecordListDTO.class);
+                encryptUtil.decryptList(page.getList(), SalaryItemAdjustRecordListDTO.class);
+                return page;
+            }
         } finally {
             sqlSession.close();
         }