Commit 3678a26aab2fec10c40c5baaaedecb447dffe1df

Authored by xianpengcheng
Committed by 姜超
1 parent e8cf26f2

更新薪酬计算的校验

fw-morax-server/src/main/java/cn/fw/morax/server/task/SalaryReportTask.java
@@ -703,6 +703,9 @@ public class SalaryReportTask { @@ -703,6 +703,9 @@ public class SalaryReportTask {
703 .in(SalaryPoolDetail::getSalaryPoolId, pools.stream().map(SalaryPool::getId).collect(Collectors.toSet())) 703 .in(SalaryPoolDetail::getSalaryPoolId, pools.stream().map(SalaryPool::getId).collect(Collectors.toSet()))
704 .eq(SalaryPoolDetail::getSalaryDate, date) 704 .eq(SalaryPoolDetail::getSalaryDate, date)
705 .eq(SalaryPoolDetail::getYn, Boolean.TRUE)); 705 .eq(SalaryPoolDetail::getYn, Boolean.TRUE));
  706 + if (CollectionUtils.isEmpty(salaryPoolDetailList)){
  707 + return Collections.emptyMap();
  708 + }
706 return salaryPoolDetailList.stream().collect(Collectors.groupingBy(SalaryPoolDetail::getSalaryPoolId)); 709 return salaryPoolDetailList.stream().collect(Collectors.groupingBy(SalaryPoolDetail::getSalaryPoolId));
707 } 710 }
708 711