Browse Source

fix :FOV-64

lvxianyun 3 years ago
parent
commit
dfa0c33336

+ 1 - 1
src/main/java/com/persagy/proxy/object/controller/AdmSystemController.java

@@ -309,7 +309,7 @@ public class AdmSystemController {
                             admFloorList.stream().forEach(admFloor -> {
                                 ObjectNode infobd = JsonNodeFactory.instance.objectNode();
                                 infobd.put("BuildID",admFloor.getBuildingId());
-                                infobd.put("BuildName",admFloor.getBuilding() == null ? (admBuildingMap.get(admFloor.getBuildingId()) != null ? admBuildingMap.get(admFloor.getBuildingId()).getLocalName() : "") :admFloor.getBuilding().getLocalName());
+                                infobd.put("BuildName",admFloor.getBuilding() != null ? admFloor.getBuilding().getLocalName() : ((CollUtil.isNotEmpty(admBuildingMap) && admBuildingMap.get(admFloor.getBuildingId()) != null) ? admBuildingMap.get(admFloor.getBuildingId()).getLocalName() : ""));
                                 infobd.put("FloorID",admFloor.getId());
                                 infobd.put("FloorName",admFloor.getLocalName());
                                 buildingFloorInfoList.add(infobd);