修改设备编辑参数分类显示异常

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -181,7 +181,7 @@ public class FireFightingSystemController extends AbstractBaseController {
     @ApiOperation(httpMethod = "GET", value = "通过装备定义id查找性能指标")
     public Map<String, Object> getPrefList(Long equipmentId, Long specificId) {
         HashMap<String, List> map = new HashMap<>();
-        ConcurrentHashMap map1 = new ConcurrentHashMap();
+        List<EquProperty> properALlList =  new ArrayList<>();
         List<String> list = equipmentIndexService.getGruopName(equipmentId);
         list.forEach(x -> {
             QueryWrapper<EquipmentIndex> wrapper = new QueryWrapper<>();
@@ -201,6 +201,7 @@ public class FireFightingSystemController extends AbstractBaseController {
                 equProperty.setEquipmentIndexKey(y.getPerfQuotaDefinitionId());
                 properList.add(equProperty);
             });
+            properALlList.addAll(properList);
             map.put(x, properList);
         });
         QueryWrapper<EquipmentIndex> wrappernull = new QueryWrapper<>();
@@ -220,7 +221,8 @@ public class FireFightingSystemController extends AbstractBaseController {
             equProperty.setEquipmentIndexKey(y.getPerfQuotaDefinitionId());
             properList.add(equProperty);
         });
-        properList.forEach(e -> {
+        properALlList.addAll(properList);
+        properALlList.forEach(e -> {
             List<EquipmentIndexVO> equipmentIndexList = equipmentSpecificIndexMapper.getEquipIndexByIndexId(e.getEquipmentIndexId(), specificId);
             if (equipmentIndexList.size() > 0) {
                 if (StringUtil.isNotEmpty(equipmentIndexList.get(0).getValue())) {