From c686f5215315b9577e53a6dc2e56568224d3d0db Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Sun, 23 Apr 2023 18:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?=
 =?UTF-8?q?=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C=E8=A1=A5=E5=B7=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=83=A8=E5=88=86=E7=A6=8F=E5=88=A9=E9=A1=B9=E7=BC=B4?=
 =?UTF-8?q?=E8=B4=B9=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3=E5=90=88=E8=AE=A1?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/SIAccountServiceImpl.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index b75972dc5..57e41729d 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -1704,19 +1704,19 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
         if (!StringUtils.isEmpty(baseMap.getOrDefault("社保个人合计", "").toString())) {
             insuranceAccountDetailPO.setSocialPerSum(baseMap.get("社保个人合计").toString());
-        } else {
+        } else if (!socialPerMap.isEmpty()) {
             insuranceAccountDetailPO.setSocialPerSum(sumOfMapValue(socialPerMap));
         }
 
         if (!StringUtils.isEmpty(baseMap.getOrDefault("公积金个人合计", "").toString())) {
             insuranceAccountDetailPO.setFundPerSum(baseMap.get("公积金个人合计").toString());
-        } else {
+        } else if (!fundPerMap.isEmpty()) {
             insuranceAccountDetailPO.setFundPerSum(sumOfMapValue(fundPerMap));
         }
 
         if (!StringUtils.isEmpty(baseMap.getOrDefault("其他福利个人合计", "").toString())) {
             insuranceAccountDetailPO.setOtherPerSum(baseMap.get("其他福利个人合计").toString());
-        } else {
+        } else if (!otherPerMap.isEmpty()) {
             insuranceAccountDetailPO.setOtherPerSum(sumOfMapValue(otherPerMap));
         }
 
@@ -1730,19 +1730,19 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
         if (!StringUtils.isEmpty(baseMap.getOrDefault("社保单位合计", "").toString())) {
             insuranceAccountDetailPO.setSocialComSum(baseMap.get("社保单位合计").toString());
-        } else {
+        } else if (!socialComMap.isEmpty()) {
             insuranceAccountDetailPO.setSocialComSum(sumOfMapValue(socialComMap));
         }
 
         if (!StringUtils.isEmpty(baseMap.getOrDefault("公积金单位合计", "").toString())) {
             insuranceAccountDetailPO.setFundComSum(baseMap.get("公积金单位合计").toString());
-        } else {
+        } else if (!fundComMap.isEmpty()) {
             insuranceAccountDetailPO.setFundComSum(sumOfMapValue(fundComMap));
         }
 
         if (!StringUtils.isEmpty(baseMap.getOrDefault("其他福利单位合计", "").toString())) {
             insuranceAccountDetailPO.setOtherComSum(baseMap.get("其他福利单位合计").toString());
-        } else {
+        } else if (!otherComMap.isEmpty()) {
             insuranceAccountDetailPO.setOtherComSum(sumOfMapValue(otherComMap));
         }