From c872fc69ba782978f0b791c74120a7f6b02df9b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 9 Dec 2024 17:13:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=88=86=E9=A1=B5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/wrapper/SalarySobItemWrapper.java    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/com/engine/salary/wrapper/SalarySobItemWrapper.java b/src/com/engine/salary/wrapper/SalarySobItemWrapper.java
index e1ed86869..07006c6a4 100644
--- a/src/com/engine/salary/wrapper/SalarySobItemWrapper.java
+++ b/src/com/engine/salary/wrapper/SalarySobItemWrapper.java
@@ -75,9 +75,7 @@ public class SalarySobItemWrapper extends Service {
         Integer searchPageSize = queryParam.getPageSize();
         Integer searchCurrent = queryParam.getCurrent();
 
-        PageInfo<SalaryItemPO> page = getSalaryItemService(user).listPageByParam(queryParam);
-
-        List<SalaryItemPO> salaryItemList = page.getList();
+        List<SalaryItemPO> salaryItemList = getSalaryItemService(user).listByParam(queryParam);
 
         Set<Long> taxAgentIds = getTaxAgentService(user).listAllTaxAgents((long) user.getUID())
                 .stream().map(TaxAgentPO::getId)
@@ -95,22 +93,23 @@ public class SalarySobItemWrapper extends Service {
                     }
                 })
                 .collect(Collectors.toList());
-        salaryItemList = SalaryPageUtil.buildPage(searchCurrent, searchPageSize, salaryItemList).getList();
+
 
         //最终返回的分页对象
         PageInfo<SalaryItemSobListDTO> dtoPage = new PageInfo<>(SalaryItemSobListDTO.class);
         dtoPage.setPageSize(searchPageSize);
         dtoPage.setPageNum(searchCurrent);
-        dtoPage.setTotal(page.getTotal());
-        if (CollectionUtils.isNotEmpty(salaryItemList)) {
+        dtoPage.setTotal(salaryItemList.size());
+        List<SalaryItemPO> list = SalaryPageUtil.buildPage(searchCurrent, searchPageSize, salaryItemList).getList();
+        if (CollectionUtils.isNotEmpty(list)) {
             // 查询公式
-            Set<Long> formulaIds = SalaryEntityUtil.properties(salaryItemList, SalaryItemPO::getFormulaId);
+            Set<Long> formulaIds = SalaryEntityUtil.properties(list, SalaryItemPO::getFormulaId);
             List<ExpressFormula> expressFormulas = getSalaryFormulaService(user).listExpressFormula(formulaIds);
             // 查询系统薪资项目
-            Set<Long> sysSalaryItemIds = SalaryEntityUtil.properties(salaryItemList, SalaryItemPO::getSysSalaryItemId);
+            Set<Long> sysSalaryItemIds = SalaryEntityUtil.properties(list, SalaryItemPO::getSysSalaryItemId);
             List<SysSalaryItemPO> sysSalaryItemPOS = getSysSalaryItemService(user).listByIds(sysSalaryItemIds);
             // 转换成薪资项目列表dto
-            dtoPage.setList(SalaryItemBO.convert2itemSobListDTO(salaryItemList, expressFormulas, sysSalaryItemPOS));
+            dtoPage.setList(SalaryItemBO.convert2itemSobListDTO(list, expressFormulas, sysSalaryItemPOS));
         }
         return dtoPage;