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

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemInspectListServiceImpl.java

@@ -74,11 +74,16 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
 
         if(CollectionUtils.isNotEmpty(comoanyList)){
             List<String> companyList = new ArrayList<>();
-            for(int j=0;j<companyIdList.size();j++){
-                companyList.add(companyIdList.get(j).getCompanyId());
+            if (CollectionUtils.isNotEmpty(companyIdList)){
+                for(int j=0;j<companyIdList.size();j++){
+                    companyList.add(companyIdList.get(j).getCompanyId());
+                }
+            }else {
+                for(int j=0;j<comoanyList.size();j++){
+                    companyList.add(comoanyList.get(j).getCompanyId());
+                }
             }
 
-
             LambdaQueryWrapper<DemInspectList> QueryWrapper1 = Wrappers.lambdaQuery();
             if(StringUtils.isNotBlank(companyName)){
                 if(CollectionUtils.isNotEmpty(companyList)){