fix: 修复线上BUG

adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java

@@ -56,7 +56,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
             resource.setTreeType("sarMs");
             QueryWrapper<SarMenuStandard> TsResourceQueryWrapper=new QueryWrapper<>();
             TsResourceQueryWrapper.like("PARENT_IDS",resource.getId());
-            TsResourceQueryWrapper.in(null!=access,"ID",access);
+            TsResourceQueryWrapper.in(null!=access && !access.isEmpty(),"ID",access);
             TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
             List<SarMenuStandard> children=dao.selectList(TsResourceQueryWrapper);
             resource.setChildren(recursionGetListChildrenStand((resource),(children)));
@@ -83,9 +83,4 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
         return tsResources;
     }
 
-
-
-
-
-
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -1977,14 +1977,22 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
 
         // 发布稿
-        List<String> fbgNew = Arrays.stream(newMap.getOrDefault("FBGBJBD", "").toString().split(","))
+        List<String> fbgNew = new ArrayList<>();
-                .map(String::trim).collect(Collectors.toList());
+        if(newMap!=null && newMap.containsKey("FBGBJBD")){
+            fbgNew = Arrays.stream(newMap.getOrDefault("FBGBJBD", "").toString().split(","))
+                    .map(String::trim).collect(Collectors.toList());
+        }
+
+        List<String> fbgOld = new ArrayList<>();
+        if(oldMap!=null && oldMap.containsKey("FBGBJBD")){
+            fbgOld = Arrays.stream(oldMap.getOrDefault("FBGBJBD", "").toString().split(","))
+                    .map(String::trim).collect(Collectors.toList());
+        }
 
-        List<String> fbgOld = Arrays.stream(oldMap.getOrDefault("FBGBJBD", "").toString().split(","))
-                .map(String::trim).collect(Collectors.toList());
         // 取差集 判断是否有新的发布稿
+        List<String> finalFbgOld = fbgOld;
         List<String> filterDisunityFbg = fbgNew.stream()
-                .filter(item -> !new ArrayList<>(fbgOld)
+                .filter(item -> !new ArrayList<>(finalFbgOld)
                         .contains(item))
                 .collect(Collectors.toList());