Merge remote-tracking branch 'origin/shuimu-dev' into shuimu-dev

modules/thing/src/main/java/com/thing/thing/relation/root/service/impl/IotThingRelationRootServiceImpl.java

@@ -133,7 +133,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();
     }