From dba2f48785482e2bf5ea00cf9cfee9d3b45e23f0 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Wed, 25 Oct 2023 11:18:10 +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=E6=A1=A3=E6=A1=88=EF=BC=8C=E7=A6=8F=E5=88=A9=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E5=9F=BA=E6=95=B0=E8=B0=83=E6=95=B4=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=A9=BA=E5=80=BC=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIArchivesBiz.java | 57 +++++++++++---------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java
index 7f91e79d1..05d985742 100644
--- a/src/com/engine/salary/biz/SIArchivesBiz.java
+++ b/src/com/engine/salary/biz/SIArchivesBiz.java
@@ -1967,7 +1967,7 @@ public class SIArchivesBiz {
         Date now = new Date();
         List<InsuranceArchivesBaseHistoryPO> toCreateAdjustHistoryList = new ArrayList<>();
         //旧档案不存在基数信息，则直接遍历新的基数数据，生成调整记录；旧档案存在基数信息，则合并新旧基数数据，遍历合并后的技术数据中的key，生成调整记录。
-        if(adjustInfo.getAdjustAfterBaseJson() != null && adjustInfo.getAdjustBeforeBaseJson() == null) {
+        if(StringUtils.isNotBlank(adjustInfo.getAdjustAfterBaseJson()) && StringUtils.isBlank(adjustInfo.getAdjustBeforeBaseJson())) {
             Map<String, Object> adjustAfterBaseMap = JSON.parseObject(adjustInfo.getAdjustAfterBaseJson(), new TypeReference<Map<String, Object>>() {
             });
             for (String key : adjustAfterBaseMap.keySet()) {
@@ -1985,36 +1985,43 @@ public class SIArchivesBiz {
                 adjustItem.setId(IdGenerator.generate());
                 toCreateAdjustHistoryList.add(adjustItem);
             }
-        } else if (adjustInfo.getAdjustAfterBaseJson() != null && adjustInfo.getAdjustBeforeBaseJson() != null) {
+        } else if (StringUtils.isNotBlank(adjustInfo.getAdjustAfterBaseJson()) && StringUtils.isNotBlank(adjustInfo.getAdjustBeforeBaseJson())) {
             Map<String, Object> adjustAfterBaseMap = JSON.parseObject(adjustInfo.getAdjustAfterBaseJson(), new TypeReference<Map<String, Object>>() {
             });
             Map<String, Object> adjustBeforeBaseMap = JSON.parseObject(adjustInfo.getAdjustBeforeBaseJson(), new TypeReference<Map<String, Object>>() {
             });
             Map<String, Object> reDealMap = new HashMap<>();
-            reDealMap.putAll(adjustAfterBaseMap);
-            reDealMap.putAll(adjustBeforeBaseMap);
-            for (String key : reDealMap.keySet()) {
-                String beforeValue = (String) adjustBeforeBaseMap.get(key);
-                String afterValue = (String) adjustAfterBaseMap.get(key);
-                if (SalaryEntityUtil.empty2Zero(beforeValue).compareTo(SalaryEntityUtil.empty2Zero(afterValue)) == 0) {
-                    continue;
-                }
-                InsuranceArchivesBaseHistoryPO adjustItem = new InsuranceArchivesBaseHistoryPO();
-                BeanUtils.copyProperties(adjustInfo, adjustItem);
-                adjustItem.setAdjustWelfareItemId(Long.valueOf(key));
-                adjustItem.setAdjustBeforeBaseValue(beforeValue);
-                adjustItem.setAdjustAfterBaseValue(afterValue);
-                adjustItem.setOperateTime(now);
-                adjustItem.setOperator(creator);
-                adjustItem.setCreator(creator);
-                adjustItem.setCreateTime(now);
-                adjustItem.setUpdateTime(now);
-                adjustItem.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue());
-                adjustItem.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY);
-                adjustItem.setId(IdGenerator.generate());
-
-                toCreateAdjustHistoryList.add(adjustItem);
+            if (adjustAfterBaseMap != null) {
+                reDealMap.putAll(adjustAfterBaseMap);
             }
+            if (adjustBeforeBaseMap != null) {
+                reDealMap.putAll(adjustBeforeBaseMap);
+            }
+            if (reDealMap.size() >0) {
+                for (String key : reDealMap.keySet()) {
+                    String beforeValue = (String) adjustBeforeBaseMap.get(key);
+                    String afterValue = (String) adjustAfterBaseMap.get(key);
+                    if (SalaryEntityUtil.empty2Zero(beforeValue).compareTo(SalaryEntityUtil.empty2Zero(afterValue)) == 0) {
+                        continue;
+                    }
+                    InsuranceArchivesBaseHistoryPO adjustItem = new InsuranceArchivesBaseHistoryPO();
+                    BeanUtils.copyProperties(adjustInfo, adjustItem);
+                    adjustItem.setAdjustWelfareItemId(Long.valueOf(key));
+                    adjustItem.setAdjustBeforeBaseValue(beforeValue);
+                    adjustItem.setAdjustAfterBaseValue(afterValue);
+                    adjustItem.setOperateTime(now);
+                    adjustItem.setOperator(creator);
+                    adjustItem.setCreator(creator);
+                    adjustItem.setCreateTime(now);
+                    adjustItem.setUpdateTime(now);
+                    adjustItem.setDeleteType(DeleteTypeEnum.NOT_DELETED.getValue());
+                    adjustItem.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY);
+                    adjustItem.setId(IdGenerator.generate());
+
+                    toCreateAdjustHistoryList.add(adjustItem);
+                }
+            }
+
         }
         return toCreateAdjustHistoryList;
     }