Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -229,10 +229,17 @@ public class SupervisionConfigureController extends AbstractBaseController {
         if (commonPageable.getPageNumber() == 0) {
             commonPageable.setPageNumber(1);
         }
-        Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
-        if (StringUtils.isEmpty(bizOrgCode)) {
-            return CommonResponseUtil.success(null);
+        if(ObjectUtils.isEmpty(bizOrgCode)){
+            ReginParams reginParams = getSelectedOrgInfo();
+            ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+            if (!ValidationUtil.isEmpty(personIdentity)) {
+                bizOrgCode = personIdentity.getBizOrgCode();
+                if (bizOrgCode == null) {
+                    return CommonResponseUtil.success(null);
+                }
+            }
         }
+        Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
         Page<Map<String, Object>> pressurePumpInfo = fireFightingSystemMapper.getPressurePumpInfo(page, bizOrgCode, null);
         List<Long> ids = new ArrayList();
         pressurePumpInfo.getRecords().stream().map(item -> {