From 2659f0a783db873e3728ea9ed7d6ef9481c54fcf Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 12 Jan 2022 23:58:15 +0800
Subject: [PATCH] feat: There is no way the,

---
 .../service/ActSarItemsBussEOService.java     |  4 ++--
 .../impl/SarBussionessStandServiceImpl.java   | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
index b12e5a5c..badbd890 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
@@ -161,7 +161,7 @@ public class ActSarItemsBussEOService {
                 iSarBussionessStandService.attrInfoDetails(query);
                 Map<String, Object> attrInfoMap = query.getAttrInfoMap();
                 if(attInfoMap!=null && !attInfoMap.isEmpty()){
-                    updateStandFileFieldData(attInfoMap,attrInfoMap);
+//                    updateStandFileFieldData(attInfoMap,attrInfoMap);
                     resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
                     sarBussionessStand.setSarStandAttrEOStr(resData);
                 }
@@ -192,7 +192,7 @@ public class ActSarItemsBussEOService {
                 iSarBussionessStandService.attrInfoDetails(query);
                 Map<String, Object> attrInfoMap = query.getAttrInfoMap();
                 if(attInfoMap!=null && !attInfoMap.isEmpty()){
-                    updateStandFileFieldData(attInfoMap,attrInfoMap);
+//                    updateStandFileFieldData(attInfoMap,attrInfoMap);
                     resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
                     sarBussionessStand.setSarStandAttrEOStr(resData);
                 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 9c2998f9..7ac71ba6 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -473,15 +473,18 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         if (StringUtils.isNotBlank(attrStr)) {
             newMap = JSONObject.fromObject(attrStr);
         }
-        newMap = changeMap(sarStandardsInfoEO,newMap);
-        oldMap = changeMap(beforeSarStandardsInfo,oldMap);
-        String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getStandSort());
-        String number = sortName + " " + sarStandardsInfoEO.getStandCode();
-        if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
-            number += "-" + sarStandardsInfoEO.getStandYear();
+        if(newMap != null && oldMap != null) {
+            newMap = changeMap(sarStandardsInfoEO,newMap);
+            oldMap = changeMap(beforeSarStandardsInfo,oldMap);
+            String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getStandSort());
+            String number = sortName + " " + sarStandardsInfoEO.getStandCode();
+            if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
+                number += "-" + sarStandardsInfoEO.getStandYear();
+            }
+            String content = number + " 《" + sarStandardsInfoEO.getStandName() + "》";
+            sarUpdLogEOService.createUpdateLog(SarTypeEnum.BUSINESS.getValue(),sarStandardsInfoEO.getId(),oldMap,newMap,content);
+
         }
-        String content = number + " 《" + sarStandardsInfoEO.getStandName() + "》";
-        sarUpdLogEOService.createUpdateLog(SarTypeEnum.BUSINESS.getValue(),sarStandardsInfoEO.getId(),oldMap,newMap,content);
     }
 
     public Map<String,Object> changeMap (SarBussionessStand sarStandardsInfoEO,Map<String,Object> map) {