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