Merge branch 'develop_dl_plan6_temp' of…

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/EquipmentServiceImpl.java

@@ -75,6 +75,7 @@ public class EquipmentServiceImpl {
         List<Map<String, Object>> buildingMapList = (List<Map<String, Object>>) response.getResult();
         List<MenuFrom> buildingTreeList = Lists.newArrayList();
         buildingMapList.forEach(building -> {
+
             MenuFrom menuFrom = new MenuFrom((String) building.get("id"), "全部建筑", (String) building.get("parentId"),
                     "0");
             List<Map<String, Object>> children = (List<Map<String, Object>>) building.get("children");
@@ -93,6 +94,10 @@ public class EquipmentServiceImpl {
                         (String) child.get("parentId"), "0");
                 if (!ValidationUtil.isEmpty(child.get("children"))) {
                     parseTree(menuFrom, (List<Map<String, Object>>) child.get("children"));
+                    if(parent!=null){
+                        parent.setIsLeaf(false);
+                    }
+
                 } else {
                     parent.setIsLeaf(false);
                 }