From d11ce28f955ae928a5aedaf887f09bd2ee99bc31 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Wed, 25 Dec 2024 10:42:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=85=B3=E7=B3=BB=E8=A7=86=E5=9B=BEbu?=
 =?UTF-8?q?g=202024=E5=B9=B412=E6=9C=8825=E6=97=A510:42:08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IotThingRelationRootServiceImpl.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 419dd37..e9d9d5a 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
@@ -123,6 +123,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, null,tenantCode);
+
         return rootList.stream()
                 .filter(jsonObject -> {
                     boolean passesFilter = JacksonUtil.filter(jsonObject, pairs);
@@ -133,7 +134,12 @@ public class IotThingRelationRootServiceImpl extends BaseServiceImpl<IotThingRel
                     }
                     return passesFilter;
                 })
-                .filter(s-> s.get(CacheNameEnum.RelationRootField.THING_RELATION_ROOT_GROUP_NAME.getField()).asText().equals(groupName))
+                .filter(s -> {
+                    if(StringUtils.isNotBlank(groupName)){
+                        return s.get(CacheNameEnum.RelationRootField.THING_RELATION_ROOT_GROUP_NAME.getField()).asText().equals(groupName);
+                    }
+                    return true;
+                } )
                 .sorted(comparator.thenComparing(obj -> obj.get(CacheNameEnum.RelationRootField.THING_RELATION_ROOT_ID.getField()).asLong())).toList();
     }