fix过滤引擎

1 year ago · 12b67ac7d8
1 changed files with 6 additions and 3 deletions
--- 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
@ -244,6 +244,7 @@ public class FilterLogSaveEventListener {
            if (onlyMergeMissThingAttr) {
                thingAttrs = currentLog.getMissingThingAttrs();
                if (CollectionUtils.isEmpty(thingAttrs)) {
+                    mergedLogs.add(currentLog);
                    continue;
                }
            } else {
@ -271,7 +272,9 @@ public class FilterLogSaveEventListener {
                        }
                    });
        }
+        if (!unMergedLogs.isEmpty()) {
            mergedLogs.addAll(unMergedLogs);
+        }
        return mergedLogs.stream().filter(Objects::nonNull).collect(Collectors.toSet());
    }