水厂和集团 都要获取统计信息和省市区的名字

ruoyi-system/src/main/java/com/ruoyi/business/service/impl/TOrganizationServiceImpl.java

@@ -63,8 +63,21 @@ public class TOrganizationServiceImpl implements ITOrganizationService
 
         //如果是集团，获取下面的所有的水厂列表
         Integer type = organization.getType();
-        if(0 == type)
-            organization.setChildren(this.tOrganizationMapper.selectTOrganizationList(TOrganization.builder().parentId(id).build()));
+        if(0 == type){
+            //2025年03月12日16:32:31 下面的水厂也要获取省市区 和 设备信息
+            List<TOrganization> tOrganizations = this.tOrganizationMapper.selectTOrganizationList(TOrganization.builder().parentId(id).build());
+            if(!CollectionUtils.isEmpty(tOrganizations)){
+                for (TOrganization tOrganization : tOrganizations) {
+                    tOrganization.setLxjcCounts(bizDeviceMapper.selectBizDeviceList(BizDevice.builder().deviceWorks(tOrganization.getId()).type("2").build()).size());
+                    tOrganization.setRobotCounts(bizDeviceMapper.selectBizDeviceList(BizDevice.builder().deviceWorks(tOrganization.getId()).type("1").build()).size());
+                    //处理省市区名字
+                    tOrganization.setProvinceName(this.sysRegionMapper.selectNameByCode(tOrganization.getProvinceCode()));
+                    tOrganization.setCityName(this.sysRegionMapper.selectNameByCode(tOrganization.getCityCode()));
+                    tOrganization.setCountryName(this.sysRegionMapper.selectNameByCode(tOrganization.getCountryCode()));
+                }
+            }
+            organization.setChildren(tOrganizations);
+        }
     }
 
     /**