From 5ef5921a6a8af840c940cf2e24f3be623dd0d271 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 5 Mar 2025 17:04:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=AF=E6=B9=BE=E6=8A=A5=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/SalaryAcctResultServiceImpl.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index fc4e99ca9..27cf8d9f8 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -2261,6 +2261,9 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
             // 获取薪资核算人员
             List<Long> salaryAcctRecordIds = salaryAcctRecordList.stream().map(SalaryAcctRecordPO::getId).collect(Collectors.toList());
             List<SalaryAcctEmployeePO> salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordIds(salaryAcctRecordIds);
+            if (CollectionUtils.isEmpty(salaryAcctRecordIds)) {
+                salaryAcctEmployeeList = new ArrayList<>();
+            }
             List<Long> salaryAcctEmpIds = salaryAcctEmployeeList.stream().map(SalaryAcctEmployeePO::getId).collect(Collectors.toList());
             List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(salaryAcctEmployeeList.stream().map(SalaryAcctEmployeePO::getEmployeeId).collect(Collectors.toList()));
             // 获取薪资核算数据
@@ -2273,7 +2276,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
 
             List<Map<String, Object>> acctResultMap = SalaryAcctResultBO.buildData4Shgw(salaryItemPOList, Collections.emptyList(), employeeList, salaryAcctEmployeeList, acctResultList, taxAgentList, user);
             // 根据部门和部门编号分组
-            Map<String, List<Map<String, Object>>> acctResultGroupMap = SalaryEntityUtil.group2Map(acctResultMap, result -> result.getOrDefault("taxAgentName", "") + "_split" + resultMap.getOrDefault(fylxSalaryItemId, ""));
+            Map<String, List<Map<String, Object>>> acctResultGroupMap = SalaryEntityUtil.group2Map(acctResultMap, result -> result.getOrDefault("taxAgentName", "") + "_split" + result.getOrDefault(fylxSalaryItemId.toString(), ""));
             List<SalaryItemPO> numberItems = salaryItemPOList.stream().filter(item -> item.getDataType().equals(SalaryDataTypeEnum.NUMBER.getValue())).collect(Collectors.toList());
             LinkedHashMap<String, Map<String, Object>> sumResultByGroup = getSumResultByGroup(acctResultGroupMap, Collections.emptyList(), numberItems, gwReportConfigList, ufHwxcbbpzList, taxAgentPO, SalaryDateUtil.dateStrToLocalYearMonth(param.getStartMonthStr()));