From 58012fe1e16d8ee37a52a8227b3022e2ebb65cb2 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 18 Sep 2024 16:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BE=E4=BF=9D=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E6=A1=A3=E6=A1=88=E8=A1=A5=E7=BC=B4=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/SIBalanceServiceImpl.java    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
index bb0c776b3..4b7750224 100644
--- a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
@@ -172,7 +172,9 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
             Map<String, String> socialComMap = JSON.parseObject(socialSchemePO.getSocialPaymentComBaseString(), new HashMap<String, String>().getClass());
             List<String> socialIds = new ArrayList<>();
             socialIds.addAll(socialMap.keySet());
-            socialIds.addAll(socialComMap.keySet());
+            if (socialComMap != null) {
+                socialIds.addAll(socialComMap.keySet());
+            }
             socialIds = socialIds.stream().distinct().collect(Collectors.toList());
             //查询该福利方案下开启缴纳的福利项
             List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId());
@@ -213,7 +215,9 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
             Map<String, String> fundComMap = JSON.parseObject(fundSchemePO.getFundPaymentComBaseString(), new HashMap<String, String>().getClass());
             List<String> fundIds = new ArrayList<>();
             fundIds.addAll(fundMap.keySet());
-            fundIds.addAll(fundComMap.keySet());
+            if (fundComMap != null) {
+                fundIds.addAll(fundComMap.keySet());
+            }
             fundIds = fundIds.stream().distinct().collect(Collectors.toList());
             //查询该福利方案下开启缴纳的福利项
             List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(fundSchemePO.getFundSchemeId());
@@ -254,7 +258,9 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
             Map<String, String> otherComMap = JSON.parseObject(otherSchemePO.getOtherPaymentComBaseString(), new HashMap<String, String>().getClass());
             List<String> otherIds = new ArrayList<>();
             otherIds.addAll(otherMap.keySet());
-            otherIds.addAll(otherComMap.keySet());
+            if (otherComMap != null) {
+                otherIds.addAll(otherComMap.keySet());
+            }
             otherIds = otherIds.stream().distinct().collect(Collectors.toList());
             //查询该福利方案下开启缴纳的福利项
             List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(otherSchemePO.getOtherSchemeId());