From 10266bf73982fc705e7cedace88706cbecca19e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 17 Dec 2024 15:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A6=BB=E8=81=8C=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E6=97=A0=E6=B3=95=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/SalaryAcctExcelServiceImpl.java      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index ce89f8196..67aff3ecd 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -1082,9 +1082,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
         stopWatch.stop();
         // 租户下所有的人员
         stopWatch.start("薪资核算确认的人员");
-        List<DataCollectionEmployee> salaryEmployees = getSalaryEmployeeService(user).listAllForReport();
-        Map<String, Long> salaryEmployeeMap = SalaryEntityUtil.convert2Map(salaryEmployees, DataCollectionEmployee::getUsername, DataCollectionEmployee::getEmployeeId);
-        Map<Long, DataCollectionEmployee> emps = SalaryEntityUtil.convert2Map(salaryEmployees, DataCollectionEmployee::getEmployeeId);
+        List<Long> employeeIds = SalaryEntityUtil.properties(salaryAcctEmployees, SalaryAcctEmployeePO::getEmployeeId, Collectors.toList());
+        List<DataCollectionEmployee> salaryEmployees = getSalaryEmployeeService(user).getEmployeeByIdsAll(employeeIds);
         stopWatch.stop();
         // 租户下所有的个税扣缴义务人
         stopWatch.start("租户下所有的个税扣缴义务人");