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 salaryAcctRecordIds = salaryAcctRecordList.stream().map(SalaryAcctRecordPO::getId).collect(Collectors.toList()); List salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordIds(salaryAcctRecordIds); + if (CollectionUtils.isEmpty(salaryAcctRecordIds)) { + salaryAcctEmployeeList = new ArrayList<>(); + } List salaryAcctEmpIds = salaryAcctEmployeeList.stream().map(SalaryAcctEmployeePO::getId).collect(Collectors.toList()); List employeeList = getSalaryEmployeeService(user).listByIds(salaryAcctEmployeeList.stream().map(SalaryAcctEmployeePO::getEmployeeId).collect(Collectors.toList())); // 获取薪资核算数据 @@ -2273,7 +2276,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe List> acctResultMap = SalaryAcctResultBO.buildData4Shgw(salaryItemPOList, Collections.emptyList(), employeeList, salaryAcctEmployeeList, acctResultList, taxAgentList, user); // 根据部门和部门编号分组 - Map>> acctResultGroupMap = SalaryEntityUtil.group2Map(acctResultMap, result -> result.getOrDefault("taxAgentName", "") + "_split" + resultMap.getOrDefault(fylxSalaryItemId, "")); + Map>> acctResultGroupMap = SalaryEntityUtil.group2Map(acctResultMap, result -> result.getOrDefault("taxAgentName", "") + "_split" + result.getOrDefault(fylxSalaryItemId.toString(), "")); List numberItems = salaryItemPOList.stream().filter(item -> item.getDataType().equals(SalaryDataTypeEnum.NUMBER.getValue())).collect(Collectors.toList()); LinkedHashMap> sumResultByGroup = getSumResultByGroup(acctResultGroupMap, Collections.emptyList(), numberItems, gwReportConfigList, ufHwxcbbpzList, taxAgentPO, SalaryDateUtil.dateStrToLocalYearMonth(param.getStartMonthStr()));