From 16c70f818361d02c2d071bc21de6da73090d1dde Mon Sep 17 00:00:00 2001
From: xianpengcheng <xianpengcheng@aliyun.com>
Date: Thu, 25 May 2023 14:23:27 +0800
Subject: [PATCH] 更新薪酬计算的校验

---
 fw-morax-server/src/main/java/cn/fw/morax/server/task/SalaryReportTask.java | 3 +++
 1 file changed, 3 insertions(+), 0 deletions(-)

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));
     }
 
--
libgit2 0.22.2