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 comparator = CompareUtils.getComparator(order, finalOrderField); //封装参数 List> 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 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(); }