Commit 40f4868a authored by tangwei's avatar tangwei

修改拓扑图bug

parent 068d964f
...@@ -655,6 +655,8 @@ public class TopographyController extends AbstractBaseController { ...@@ -655,6 +655,8 @@ public class TopographyController extends AbstractBaseController {
ConcurrentHashMap map1 = new ConcurrentHashMap(); ConcurrentHashMap map1 = new ConcurrentHashMap();
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);
...@@ -673,9 +675,12 @@ public class TopographyController extends AbstractBaseController { ...@@ -673,9 +675,12 @@ public class TopographyController extends AbstractBaseController {
properList.add(equProperty); properList.add(equProperty);
}); });
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