Commit 3678a26aab2fec10c40c5baaaedecb447dffe1df
Committed by
姜超
1 parent
e8cf26f2
更新薪酬计算的校验
Showing
1 changed file
with
3 additions
and
0 deletions
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 | ... | ... |