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

@@ -62,6 +62,10 @@ public class SupervisionConfigureController extends AbstractBaseController {
         if (commonPageable.getPageNumber() == 0) {
             commonPageable.setPageNumber(1);
         }
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
+        }
         Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
         return CommonResponseUtil.success(fireFightingSystemMapper.getWaterInfoBySuper(page, bizOrgCode));
     }
@@ -90,6 +94,10 @@ public class SupervisionConfigureController extends AbstractBaseController {
         if (commonPageable.getPageNumber() == 0) {
             commonPageable.setPageNumber(1);
         }
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            ReginParams reginParams = getSelectedOrgInfo();
+            bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
+        }
         Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
         return CommonResponseUtil.success(fireFightingSystemMapper.getPipeNetworkBySuper(page, bizOrgCode));
     }