物关系过滤bug

2024年12月23日10:30:46

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

@@ -122,7 +122,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, groupName,tenantCode);
+        List<Pair<String, String>> 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<IotThingRel
                         passesFilter = ArrayUtils.contains(idList, String.valueOf(entityId));
                     }
                     return passesFilter;
-                }).sorted(comparator.thenComparing(obj -> 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