Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildServiceImpl.java

@@ -301,26 +301,27 @@ public class BaseBuildServiceImpl extends AbstractCrudService<BaseBuildMapper, B
         queryWrapper.eq(BaseBuildFacilityRelate::getBuildId,id);
         List<BaseBuildFacilityRelate> baseBuildFacilityList = baseBuildFacilityRelateService.list(queryWrapper);
         List<Integer> facilityIdList = new ArrayList<>();
+        List<BaseBuildFacilityType> baseBuildFacilityType = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(baseBuildFacilityList)) {
             for (int i = 0; i < baseBuildFacilityList.size(); i++) {
                 facilityIdList.add(baseBuildFacilityList.get(i).getFacilityId());
             }
-        }
-        QueryWrapper<BaseBuildFacility> query4 = Wrappers.query();
-        query4.select("facility_type as facilityType","count(id) as count")
-                .in("id",facilityIdList)
-                .eq("delete_flag",0)
-                .groupBy("facility_type");
-        List<Map<String, Object>> baseBuildFacilityList5 = baseBuildFacilityService.listMaps(query4);
-        List<String> facilityTypeList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(baseBuildFacilityList5)) {
-            for (int l = 0; l < baseBuildFacilityList5.size(); l++) {
-                facilityTypeList.add(baseBuildFacilityList5.get(l).get("facilityType").toString());
+            QueryWrapper<BaseBuildFacility> query4 = Wrappers.query();
+            query4.select("facility_type as facilityType","count(id) as count")
+                    .in("id",facilityIdList)
+                    .eq("delete_flag",0)
+                    .groupBy("facility_type");
+            List<Map<String, Object>> baseBuildFacilityList5 = baseBuildFacilityService.listMaps(query4);
+            List<String> facilityTypeList = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(baseBuildFacilityList5)) {
+                for (int l = 0; l < baseBuildFacilityList5.size(); l++) {
+                    facilityTypeList.add(baseBuildFacilityList5.get(l).get("facilityType").toString());
+                }
             }
+            LambdaQueryWrapper<BaseBuildFacilityType> queryWrapper1 = Wrappers.lambdaQuery();
+            queryWrapper1.in(BaseBuildFacilityType::getTypeCode,facilityTypeList);
+            baseBuildFacilityType = baseBuildFacilityTypeService.list(queryWrapper1);
         }
-        LambdaQueryWrapper<BaseBuildFacilityType> queryWrapper1 = Wrappers.lambdaQuery();
-        queryWrapper1.in(BaseBuildFacilityType::getTypeCode,facilityTypeList);
-        List<BaseBuildFacilityType> baseBuildFacilityType = baseBuildFacilityTypeService.list(queryWrapper1);
         return baseBuildFacilityType;
     }