Commit 16c70f818361d02c2d071bc21de6da73090d1dde

Authored by xianpengcheng
1 parent 0e04cca5

更新薪酬计算的校验

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