From 5f611891a635479ffcb3f1f13c9fe33d167b13d4 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Mon, 23 Dec 2024 10:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=85=B3=E7=B3=BB=E8=BF=87=E6=BB=A4bu?=
 =?UTF-8?q?g=202024=E5=B9=B412=E6=9C=8823=E6=97=A510:30:46?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../root/service/impl/IotThingRelationRootServiceImpl.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/thing/src/main/java/com/thing/thing/relation/root/service/impl/IotThingRelationRootServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/relation/root/service/impl/IotThingRelationRootServiceImpl.java
index 6921cff..419dd37 100644
--- a/modules/thing/src/main/java/com/thing/thing/relation/root/service/impl/IotThingRelationRootServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/thing/relation/root/service/impl/IotThingRelationRootServiceImpl.java
@@ -122,7 +122,7 @@ public class IotThingRelationRootServiceImpl extends BaseServiceImpl<IotThingRel
         }
         String finalOrderField =  CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, orderField);
         Comparator<ObjectNode> comparator = CompareUtils.getComparator(order, finalOrderField); //封装参数
-        List<Pair<String, String>> pairs = buildParam(name, groupName,tenantCode);
+        List<Pair<String, String>> pairs = buildParam(name, null,tenantCode);
         return rootList.stream()
                 .filter(jsonObject -> {
                     boolean passesFilter = JacksonUtil.filter(jsonObject, pairs);
@@ -132,7 +132,9 @@ public class IotThingRelationRootServiceImpl extends BaseServiceImpl<IotThingRel
                         passesFilter = ArrayUtils.contains(idList, String.valueOf(entityId));
                     }
                     return passesFilter;
-                }).sorted(comparator.thenComparing(obj -> obj.get(CacheNameEnum.RelationRootField.THING_RELATION_ROOT_ID.getField()).asLong())).toList();
+                })
+                .filter(s-> s.get(CacheNameEnum.RelationRootField.THING_RELATION_ROOT_GROUP_NAME.getField()).asText().equals(groupName))
+                .sorted(comparator.thenComparing(obj -> obj.get(CacheNameEnum.RelationRootField.THING_RELATION_ROOT_ID.getField()).asLong())).toList();
     }
 
     @Override