diff --git a/fw-morax-server/src/main/java/cn/fw/morax/server/task/SalaryReportTask.java b/fw-morax-server/src/main/java/cn/fw/morax/server/task/SalaryReportTask.java index 1949d6f..4466544 100644 --- a/fw-morax-server/src/main/java/cn/fw/morax/server/task/SalaryReportTask.java +++ b/fw-morax-server/src/main/java/cn/fw/morax/server/task/SalaryReportTask.java @@ -703,6 +703,9 @@ public class SalaryReportTask { .in(SalaryPoolDetail::getSalaryPoolId, pools.stream().map(SalaryPool::getId).collect(Collectors.toSet())) .eq(SalaryPoolDetail::getSalaryDate, date) .eq(SalaryPoolDetail::getYn, Boolean.TRUE)); + if (CollectionUtils.isEmpty(salaryPoolDetailList)){ + return Collections.emptyMap(); + } return salaryPoolDetailList.stream().collect(Collectors.groupingBy(SalaryPoolDetail::getSalaryPoolId)); }