Commit 9ab8ebb9 authored by tangwei's avatar tangwei

修改拓扑物联信息

parent 40f4868a
...@@ -247,6 +247,7 @@ public class FireFightingSystemController extends AbstractBaseController { ...@@ -247,6 +247,7 @@ public class FireFightingSystemController extends AbstractBaseController {
List<EquProperty> properALlList = new ArrayList<>(); List<EquProperty> properALlList = new ArrayList<>();
List<String> list = equipmentIndexService.getGruopName(equipmentId); List<String> list = equipmentIndexService.getGruopName(equipmentId);
list.forEach(x -> { list.forEach(x -> {
if(!"".equals(x)) {
QueryWrapper<EquipmentIndex> wrapper = new QueryWrapper<>(); QueryWrapper<EquipmentIndex> wrapper = new QueryWrapper<>();
wrapper.eq("equipment_id", equipmentId); wrapper.eq("equipment_id", equipmentId);
wrapper.eq("group_name", x); wrapper.eq("group_name", x);
...@@ -266,9 +267,11 @@ public class FireFightingSystemController extends AbstractBaseController { ...@@ -266,9 +267,11 @@ public class FireFightingSystemController extends AbstractBaseController {
}); });
properALlList.addAll(properList); properALlList.addAll(properList);
map.put(x, properList); map.put(x, properList);
}
}); });
QueryWrapper<EquipmentIndex> wrappernull = new QueryWrapper<>(); QueryWrapper<EquipmentIndex> wrappernull = new QueryWrapper<>();
wrappernull.isNull("group_name").or().eq("group_name", " "); wrappernull.isNull("group_name").or().eq("group_name", "");
wrappernull.eq("equipment_id", equipmentId); wrappernull.eq("equipment_id", equipmentId);
wrappernull.orderByAsc("sort_num"); wrappernull.orderByAsc("sort_num");
List<EquProperty> properList = new ArrayList<>(); List<EquProperty> properList = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment