diff --git a/modules/thing/src/main/java/com/thing/thing/api/dto/ApiEntityAttrDTO.java b/modules/thing/src/main/java/com/thing/thing/api/dto/ApiEntityAttrDTO.java index bbdfa8f..94a8b67 100644 --- a/modules/thing/src/main/java/com/thing/thing/api/dto/ApiEntityAttrDTO.java +++ b/modules/thing/src/main/java/com/thing/thing/api/dto/ApiEntityAttrDTO.java @@ -90,10 +90,20 @@ public class ApiEntityAttrDTO implements Serializable { JSONArray keys1 = jsonObject.getJSONArray("keys"); JSONArray entitys = jsonObject.getJSONArray("entitys"); if(!entitys.isEmpty() && !keys1.isEmpty()){ - entityAttrMap.put(entitys.getLong(0),keys1.stream() - .map(Object::toString) - .map(Long::parseLong) - .toList()); + if(entityAttrMap.containsKey(entitys.getLong(0))){ + List longs = entityAttrMap.get(entitys.getLong(0)); + List list1 = new java.util.ArrayList<>(keys1.stream() + .map(Object::toString) + .map(Long::parseLong) + .toList()); + list1.addAll(longs); + entityAttrMap.put(entitys.getLong(0),list1); + }else{ + entityAttrMap.put(entitys.getLong(0),keys1.stream() + .map(Object::toString) + .map(Long::parseLong) + .toList()); + } } } }