diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 175233dd..26015f7a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -56,7 +56,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl 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 children=dao.selectList(TsResourceQueryWrapper); resource.setChildren(recursionGetListChildrenStand((resource),(children))); @@ -83,9 +83,4 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl fbgNew = Arrays.stream(newMap.getOrDefault("FBGBJBD", "").toString().split(",")) - .map(String::trim).collect(Collectors.toList()); + List fbgNew = new ArrayList<>(); + if(newMap!=null && newMap.containsKey("FBGBJBD")){ + fbgNew = Arrays.stream(newMap.getOrDefault("FBGBJBD", "").toString().split(",")) + .map(String::trim).collect(Collectors.toList()); + } + + List fbgOld = new ArrayList<>(); + if(oldMap!=null && oldMap.containsKey("FBGBJBD")){ + fbgOld = Arrays.stream(oldMap.getOrDefault("FBGBJBD", "").toString().split(",")) + .map(String::trim).collect(Collectors.toList()); + } - List fbgOld = Arrays.stream(oldMap.getOrDefault("FBGBJBD", "").toString().split(",")) - .map(String::trim).collect(Collectors.toList()); // 取差集 判断是否有新的发布稿 + List finalFbgOld = fbgOld; List filterDisunityFbg = fbgNew.stream() - .filter(item -> !new ArrayList<>(fbgOld) + .filter(item -> !new ArrayList<>(finalFbgOld) .contains(item)) .collect(Collectors.toList());