修改公共接口统计问题

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

@@ -1382,7 +1382,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Override
     public List<BuildingTreeVo> getCompanyBuildingTree(String authKey, String type) {
         //1.组装数据
-        List<BuildingTreeVo> companyBuildingList = buildBuildingAndCompanyListVos(authKey, type);
+        List<BuildingTreeVo> companyBuildingList = buildBuildingAndCompanyListVos(authKey, type,"building");
         //2.list to tree
         List<BuildingTreeVo> buildingTreeVos = companyBuildingList.stream().filter(a -> companyBuildingList.stream().noneMatch(c -> c.getId().toString().equals(a.getParentId()))).peek(b -> b.setChildren(getCompanyBuildingChildrenTree(b.getId().toString(), companyBuildingList))).collect(Collectors.toList());
         // 任务 7481
@@ -1442,7 +1442,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
 
-    private List<BuildingTreeVo> buildBuildingAndCompanyListVos(String authKey, String type) {
+    private List<BuildingTreeVo> buildBuildingAndCompanyListVos(String authKey, String type, String ment) {
         if (StringUtils.isEmpty(authKey)) {
             authKey = this.authKey;
         }
@@ -1464,7 +1464,12 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             vo.setName(orgUsrDto.getBizOrgName());
             vo.setId(orgUsrDto.getSequenceNbr());
             vo.setBizOrgName(orgUsrDto.getBizOrgName());
-            vo.setTotal(!StringUtils.isEmpty(orgUsrDto.getBizOrgCode()) ? formInstanceMapper.queryVideoCountByBizOrgCode(orgUsrDto.getBizOrgCode()) : 0L);
+            //此处为公共接口 未区分导致消防建筑页面树统计错误
+            if(ment.equals("video")){
+                vo.setTotal(buildingTreeVos.stream().filter(b -> !ObjectUtils.isEmpty(b.getBizOrgCode()) && b.getBizOrgCode().contains(ObjectUtils.isEmpty(vo.getBizOrgCode())?"":vo.getBizOrgCode()) && "building".equals(b.getGroupType())).count());
+            }else {
+                vo.setTotal(!StringUtils.isEmpty(orgUsrDto.getBizOrgCode()) ? formInstanceMapper.queryVideoCountByBizOrgCode(orgUsrDto.getBizOrgCode()) : 0L);
+            }
             return vo;
         }).collect(Collectors.toList());
         // 3.将建筑的bizOrgCode转换为parentId连接树 ,拼接数据准备
@@ -1488,7 +1493,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Override
     public List<BuildingTreeVo> getBuildingVideoTreeNew() {
         //1.组装数据
-        List<BuildingTreeVo> companyBuildingList = buildBuildingAndCompanyListVos(buildVideoAuthKey, null);
+        List<BuildingTreeVo> companyBuildingList = buildBuildingAndCompanyListVos(buildVideoAuthKey, null,"video");
 
 
         List<Map<String, Long>> countList = iFormInstanceService.getBuildVideoCount();