1.消防建筑树增加显示单位节点下的建筑类型的建筑数量

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/AreaServiceImpl.java

@@ -240,7 +240,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
 
     @Override
     public List<UnitAreaTreeVo> getAreaTreeListVo() {
-        // 获取公司部门list
+        // 获取公司list
         List<OrgUsrDto> orgCompanyLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey, "COMPANY");
         Map<String,Long> orgMap = orgCompanyLists.stream().collect(Collectors.toMap(OrgUsrDto::getBizOrgCode,OrgUsrDto::getSequenceNbr));
         List<UnitAreaTreeVo> orgTreeList = orgCompanyLists.stream()

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1137,6 +1137,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             vo.setName(orgUsrDto.getBizOrgName());
             vo.setId(orgUsrDto.getSequenceNbr());
             vo.setBizOrgName(orgUsrDto.getBizOrgName());
+            vo.setTotal(allListVo.stream().filter(b-> b.getBizOrgCode() != null && b.getBizOrgCode().contains(vo.getBizOrgCode()) && "building".equals(b.getGroupType())).count());
             if ("".equals(orgUsrDto.getParentId()) || "-1".equals(orgUsrDto.getParentId()) || null == orgUsrDto.getParentId()) {
                 flag.set(true);
             }