diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java index 88fcac2..bc9f3e8 100644 --- a/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java +++ b/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java @@ -241,12 +241,13 @@ public class FilterLogSaveEventListener { Set unMergedLogs = new HashSet<>(); for (FilterLogEntity currentLog : logs) { Set thingAttrs; - if(onlyMergeMissThingAttr){ + if (onlyMergeMissThingAttr) { thingAttrs = currentLog.getMissingThingAttrs(); if (CollectionUtils.isEmpty(thingAttrs)) { + mergedLogs.add(currentLog); continue; } - }else { + } else { thingAttrs = currentLog.getDefThingAttrs(); } thingAttrs.forEach( @@ -271,7 +272,9 @@ public class FilterLogSaveEventListener { } }); } - mergedLogs.addAll(unMergedLogs); + if (!unMergedLogs.isEmpty()) { + mergedLogs.addAll(unMergedLogs); + } return mergedLogs.stream().filter(Objects::nonNull).collect(Collectors.toSet()); }