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 comparator = CompareUtils.getComparator(order, finalOrderField); //封装参数 - List> pairs = buildParam(name, groupName,tenantCode); + List> 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 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