Merge branch 'han' of uskycloud/usky-modules into master

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

@@ -1075,9 +1075,9 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                     }
                 }
                 List<BaseBuildAddVO> list7 = new ArrayList<>();
-                List<BaseBuildExtinguish> list8 = new ArrayList<>();
                 for (int j = 0; j < list4.size(); j++) {
                     if (list1.get(i).getCompanyId().equals(list4.get(j).getCompanyId())) {
+                        List<BaseBuildExtinguish> list8 = new ArrayList<>();
                         BaseBuildAddVO baseBuildAddVO = new BaseBuildAddVO();
                         baseBuildAddVO.setBaseBuild(list4.get(j));
                         for (int k = 0; k < list5.size(); k++) {