From 12b67ac7d8ba73caa3ff4ccae899178cd9438ed7 Mon Sep 17 00:00:00 2001
From: siyang <2337720667@qq.com>
Date: Wed, 14 Aug 2024 14:53:40 +0800
Subject: [PATCH] =?UTF-8?q?fix=E8=BF=87=E6=BB=A4=E5=BC=95=E6=93=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filter/rule/listener/FilterLogSaveEventListener.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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<FilterLogEntity> unMergedLogs = new HashSet<>();
         for (FilterLogEntity currentLog : logs) {
             Set<String> 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());
     }