修改为测试环境appkey及权限

start/src/main/resources/sdk.yml

@@ -1,6 +1,6 @@
 sdk:
   server:
-    app-key: 7175521477324657a82fd7774917f28c
+    app-key: 4420c5c763574ea5bf71f82913fb7d00
   client:
     gateway:
       url: ${common.gateway.network.http.external}

web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java

@@ -13,6 +13,7 @@ import com.zcloud.fire.check.dto.clientobject.FireCheckListCO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,7 +41,7 @@ public class FireCheckListController {
 
     @ApiOperation("消防点检分页")
     @PostMapping("/list")
-    //    @PreAuthorize("@pms.hasAnyPermission('xfdjjl')")
+//    @PreAuthorize("@pms.hasAnyPermission('xfdjb')")
     public PageResponse<FireCheckListCO> page(@RequestBody FireCheckListPageQry qry) {
         return fireCheckListService.listPage(qry);
     }
@@ -88,7 +89,7 @@ public class FireCheckListController {
     }
     @ApiOperation("PC端-点位检查记录分页")
     @PostMapping("/checkListRecordList")
-    //    @PreAuthorize("@pms.hasAnyPermission('dwjcjl')")
+//    @PreAuthorize("@pms.hasAnyPermission('dwjcjl')")
     public PageResponse<FireCheckListCO> checkListRecordList(@RequestBody FireCheckListRecordPageQry qry) {
         return fireCheckListService.checkListRecordList(qry);
     }

web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckRecordController.java

@@ -15,6 +15,7 @@ import com.zcloud.fire.check.dto.clientobject.FireCheckRecordInfoCO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -59,6 +60,7 @@ public class FireCheckRecordController {
 
     @ApiOperation("股份端-分公司消防检查记录")
     @PostMapping("/corpCheckRecordList")
+//    @PreAuthorize("@pms.hasAnyPermission('fgsxfjcjl')")
     public PageResponse<CorpCheckStatisticsCO> corpCheckRecordList(@RequestBody CorpStatisticsPageQry qry) {
         return fireCheckRecordService.corpCheckRecordList(qry);
     }

web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckStandardController.java

@@ -16,6 +16,7 @@ import com.zcloud.fire.check.dto.clientobject.FireCheckStandardCO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -44,6 +45,7 @@ public class FireCheckStandardController {
 
     @ApiOperation("消防检查标准分页")
     @PostMapping("/list")
+//    @PreAuthorize("@pms.hasAnyPermission('xfqcjcbz')")
     public PageResponse<FireCheckStandardCO> page(@RequestBody FireCheckStandardPageQry qry) {
         return fireCheckStandardService.listPage(qry);
     }

web-adapter/src/main/java/com/zcloud/fire/check/web/FireDeviceController.java

@@ -16,6 +16,7 @@ import com.zcloud.fire.check.dto.clientobject.RiskDistributionStasticCO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -45,7 +46,7 @@ public class FireDeviceController {
 
     @ApiOperation("消防器材分页")
     @PostMapping("/list")
-    //    @PreAuthorize("@pms.hasAnyPermission('xfqc')")
+//    @PreAuthorize("@pms.hasAnyPermission('xfqcgl')")
     public PageResponse<FireDeviceCO> page(@RequestBody FireDevicePageQry qry) {
         return fireDeviceService.listPage(qry);
     }
@@ -94,11 +95,13 @@ public class FireDeviceController {
 
     @ApiOperation("股份端-消防器材统计汇总首页分页")
     @PostMapping("/corpStatisticslist")
+//    @PreAuthorize("@pms.hasAnyPermission('xfqctjhz')")
     public PageResponse<CorpStatisticsCO> corpStatisticslist(@RequestBody CorpStatisticsPageQry qry) {
         return fireDeviceService.corpStatisticslist(qry);
     }
     @ApiOperation("股份端-消防器材统计汇总首页总数")
     @GetMapping("/corpStatisticsTotal")
+//    @PreAuthorize("@pms.hasAnyPermission('xfqctjhz')")
     public SingleResponse<RiskDistributionStasticCO> corpStatisticsTotal() {
         return SingleResponse.of(fireCheckListService.riskDistributionStatistic());
     }

web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java

@@ -13,6 +13,7 @@ import com.zcloud.fire.check.dto.clientobject.FirePointCO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,7 +41,7 @@ public class FirePointController {
 
     @ApiOperation("分页")
     @PostMapping("/list")
-    //    @PreAuthorize("@pms.hasAnyPermission('xfdw')")
+//    @PreAuthorize("@pms.hasAnyPermission('xfdwwh')")
     public PageResponse<FirePointCO> page(@RequestBody FirePointPageQry qry) {
         return firePointService.listPage(qry);
     }

web-adapter/src/main/java/com/zcloud/fire/check/web/FireRegionController.java

@@ -40,7 +40,7 @@ public class FireRegionController {
 
     @ApiOperation("消防区域列表分页")
     @PostMapping("/list")
-//    @PreAuthorize("@pms.hasAnyPermission('xfqy')")
+//    @PreAuthorize("@pms.hasAnyPermission('xfqywh')")
     public PageResponse<FireRegionCO> page(@RequestBody FireRegionPageQry qry) {
         return fireRegionService.listPage(qry);
     }

web-domain/src/main/java/com/zcloud/fire/check/domain/enums/MenuEnum.java

@@ -13,15 +13,21 @@ import java.util.stream.Collectors;
 @Getter
 public enum MenuEnum {
     //消防区域
-    XFQY("/risk/container/riskControl/branchCompany/riskPoint/list", "xfqy"),
+    XFQYWH("/fireCheck/container/branchCompany/fireRegion", "xfqywh"),
     //消防点位
-    XFDW("/risk/container/riskControl/branchCompany/identifyPart/list", "xfdw"),
+    XFDWWH("/fireCheck/container/branchCompany/firePoint", "xfdwwh"),
     //消防器材
-    XFQC("/risk/container/riskControl/branchCompany/riskIedger/list", "xfqc"),
+    XFQCGL("/fireCheck/container/branchCompany/fireDevice", "xfqcgl"),
     //消防点检记录
-    XFDJJL("/risk/container/riskControl/branchCompany/accidentLedger/list", "xfdjjl"),
+    XFDJB("/fireCheck/container/branchCompany/fireCheckList/list", "xfdjb"),
     //点位检查记录
-    DWJCJL("/risk/container/hiddenDanger/branchCompany/hazardChecklist/list", "dwjcjl"),
+    DWJCJL("/fireCheck/container/branchCompany/fireCheckRecord/list", "dwjcjl"),
+    //消防器材检查标准
+    XFQCJCBZ("/fireCheck/container/supervision/fireCheckStandard", "xfqcjcbz"),
+    //消防器材统计汇总
+    XFQCTJHZ("/fireCheck/container/supervision/fireDeviceRecord/list", "xfqctjhz"),
+    //分公司消防检查记录
+    FGSXFJCJL("/fireCheck/container/supervision/fireRecords/list", "fgsxfjcjl"),
 
     ;
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/CorpInfoMapper.java

@@ -1,9 +1,14 @@
 package com.zcloud.fire.check.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.fire.check.persistence.dataobject.CorpInfoDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Map;
+
 /**
  * web-infrastructure
  *
@@ -11,7 +16,11 @@ import org.apache.ibatis.annotations.Mapper;
  * @Date 2025-10-29 16:02:16
  */
 @Mapper
+@DataScopes({
+        @DataScope(method = "listPage", menuPerms = ""),
+})
 public interface CorpInfoMapper extends BaseMapper<CorpInfoDO> {
 
+    IPage<CorpInfoDO> listPage(IPage<CorpInfoDO> iPage, Map<String, Object> params, String menuPerms);
 }
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java

@@ -2,6 +2,8 @@ package com.zcloud.fire.check.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.fire.check.domain.model.DateTimeE;
 import com.zcloud.fire.check.persistence.FireCheckPointListDO;
 import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO;
@@ -19,11 +21,15 @@ import java.util.Map;
  * @Date 2025-11-28 10:32:09
  */
 @Mapper
+@DataScopes({
+        @DataScope(method = "listPage", menuPerms = ""),
+        @DataScope(method = "checkListRecordList", menuPerms = ""),
+})
 public interface FireCheckListMapper extends BaseMapper<FireCheckListDO> {
 
     FireCheckListDO getInfoById(Long id);
 
-    IPage<FireCheckListDO> listPage(IPage<FireCheckListDO> iPage, Map<String, Object> params);
+    IPage<FireCheckListDO> listPage(IPage<FireCheckListDO> iPage, Map<String, Object> params, String menuPerms);
 
     IPage<FireCheckListDO> appCheckList(IPage<FireCheckListDO> iPage, Map<String, Object> params, DateTimeE dateTimeE);
 
@@ -35,8 +41,7 @@ public interface FireCheckListMapper extends BaseMapper<FireCheckListDO> {
 
     IPage<FireCheckListDO> getBackChecKList(IPage<FireCheckListDO> iPage, Map<String, Object> params);
 
-
+    IPage<FireCheckListDO> checkListRecordList(IPage<FireCheckListDO> iPage, Map<String, Object> params, DateTimeE dateTimeE, String menuPerms);
-    IPage<FireCheckListDO> checkListRecordList(IPage<FireCheckListDO> iPage, Map<String, Object> params, DateTimeE dateTimeE);
 
     IPage<FireCheckListDO> getCheckListRecord(IPage<FireCheckListDO> iPage, Map<String, Object> params, DateTimeE dateTimeE);
 }

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckStandardMapper.java

@@ -1,11 +1,15 @@
 package com.zcloud.fire.check.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardDO;
 import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardStatisticDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * web-infrastructure
@@ -14,8 +18,13 @@ import java.util.List;
  * @Date 2025-11-26 10:12:15
  */
 @Mapper
+@DataScopes({
+        @DataScope(method = "listPage", menuPerms = ""),
+})
 public interface FireCheckStandardMapper extends BaseMapper<FireCheckStandardDO> {
 
     List<FireCheckStandardStatisticDO> getDeviceStandardList(String fireCheckId);
+
+    IPage<FireCheckStandardDO> listPage(IPage<FireCheckStandardDO> iPage, Map<String, Object> params, String menuPerms);
 }
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireDeviceMapper.java

@@ -2,6 +2,8 @@ package com.zcloud.fire.check.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO;
 import com.zcloud.fire.check.persistence.dataobject.FireDeviceDO;
 import com.zcloud.fire.check.persistence.dataobject.FireDeviceStatisticDO;
@@ -18,11 +20,14 @@ import java.util.Map;
  * @Date 2025-11-26 10:12:34
  */
 @Mapper
+@DataScopes({
+        @DataScope(method = "getFireDevicePage", menuPerms = ""),
+})
 public interface FireDeviceMapper extends BaseMapper<FireDeviceDO> {
 
     List<FireDeviceStatisticDO> countByFireRegionIdIn(List<String> firePointIds);
 
-    IPage<FireDeviceDO> getFireDevicePage(IPage<FireDeviceDO> iPage, Map<String, Object> params);
+    IPage<FireDeviceDO> getFireDevicePage(IPage<FireDeviceDO> iPage, Map<String, Object> params, String menuPerms);
 
     List<FireDeviceDO> getAllList(@Param("params")Map<String, Object> params);
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java

@@ -2,6 +2,8 @@ package com.zcloud.fire.check.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO;
 import com.zcloud.fire.check.persistence.dataobject.FirePointDO;
 import com.zcloud.fire.check.persistence.dataobject.FirePointStatisticDO;
@@ -17,11 +19,14 @@ import java.util.Map;
  * @Date 2025-11-26 10:12:55
  */
 @Mapper
+@DataScopes({
+        @DataScope(method = "getFirePointPage", menuPerms = ""),
+})
 public interface FirePointMapper extends BaseMapper<FirePointDO> {
 
     List<FirePointStatisticDO> countByFireRegionIdIn(List<String> fireRegionIds);
 
-    IPage<FirePointDO> getFirePointPage(IPage<FirePointDO> iPage, Map<String, Object> params);
+    IPage<FirePointDO> getFirePointPage(IPage<FirePointDO> iPage, Map<String, Object> params, String menuPerms);
 
     FirePointDO getInfoById(Long id);
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireRegionMapper.java

@@ -2,6 +2,8 @@ package com.zcloud.fire.check.persistence.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO;
 import com.zcloud.fire.check.persistence.dataobject.FireRegionDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -16,9 +18,12 @@ import java.util.Map;
  * @Date 2025-11-26 10:13:09
  */
 @Mapper
+@DataScopes({
+        @DataScope(method = "getFireRegionPage", menuPerms = ""),
+})
 public interface FireRegionMapper extends BaseMapper<FireRegionDO> {
 
-    IPage<FireRegionDO> getFireRegionPage(IPage<FireRegionDO> iPage, Map<String, Object> params);
+    IPage<FireRegionDO> getFireRegionPage(IPage<FireRegionDO> iPage, Map<String, Object> params, String menuPerms);
 
     List<DataStatisticDO> countByCorpinfoIds(List<Long> corpinfoIds);
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/CorpInfoRepositoryImpl.java

@@ -8,6 +8,7 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import com.zcloud.fire.check.domain.enums.CommonFlagEnum;
+import com.zcloud.fire.check.domain.enums.MenuEnum;
 import com.zcloud.fire.check.persistence.dataobject.CorpInfoDO;
 import com.zcloud.fire.check.persistence.mapper.CorpInfoMapper;
 import com.zcloud.fire.check.persistence.repository.CorpInfoRepository;
@@ -33,10 +34,11 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
     @Override
     public PageResponse<CorpInfoDO> listPage(Map<String, Object> params) {
         IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);
-        QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
+        String menuPerms = "";
-        queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
+        if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
-        queryWrapper.orderByAsc("corp_order").orderByDesc("create_time");
+            menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
-        IPage<CorpInfoDO> result = corpInfoMapper.selectPage(iPage, queryWrapper);
+        }
+        IPage<CorpInfoDO> result = corpInfoMapper.listPage(iPage, params,menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
+import com.zcloud.fire.check.domain.enums.MenuEnum;
 import com.zcloud.fire.check.domain.model.CorpInfoE;
 import com.zcloud.fire.check.domain.model.DateTimeE;
 import com.zcloud.fire.check.domain.model.FireCheckListE;
@@ -54,7 +55,11 @@ public class FireCheckListRepositoryImpl extends BaseRepositoryImpl<FireCheckLis
                 }
             }
         }
-        IPage<FireCheckListDO> result = fireCheckListMapper.listPage(iPage, params);
+        String menuPerms = "";
+        if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
+            menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
+        }
+        IPage<FireCheckListDO> result = fireCheckListMapper.listPage(iPage, params,menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 
@@ -129,7 +134,11 @@ public class FireCheckListRepositoryImpl extends BaseRepositoryImpl<FireCheckLis
         }
         FireCheckListE fireCheckListE = new FireCheckListE();
         DateTimeE dateTimeE = fireCheckListE.getCheckRecordInterval(null);
-        IPage<FireCheckListDO> result = fireCheckListMapper.checkListRecordList(iPage, params,dateTimeE);
+        String menuPerms = "";
+        if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
+            menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
+        }
+        IPage<FireCheckListDO> result = fireCheckListMapper.checkListRecordList(iPage, params,dateTimeE,menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckStandardRepositoryImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
+import com.zcloud.fire.check.domain.enums.MenuEnum;
 import com.zcloud.fire.check.domain.model.FireCheckStandardE;
 import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardDO;
 import com.zcloud.fire.check.persistence.dataobject.FireCheckStandardStatisticDO;
@@ -32,10 +33,11 @@ public class FireCheckStandardRepositoryImpl extends BaseRepositoryImpl<FireChec
     @Override
     public PageResponse<FireCheckStandardDO> listPage(Map<String, Object> params) {
         IPage<FireCheckStandardDO> iPage = new Query<FireCheckStandardDO>().getPage(params);
-        QueryWrapper<FireCheckStandardDO> queryWrapper = new QueryWrapper<>();
+        String menuPerms = "";
-        queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
+        if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
-        queryWrapper.orderByDesc("device_name").orderByDesc("fire_device_type").orderByDesc("create_time");
+            menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
-        IPage<FireCheckStandardDO> result = fireCheckStandardMapper.selectPage(iPage, queryWrapper);
+        }
+        IPage<FireCheckStandardDO> result = fireCheckStandardMapper.listPage(iPage, params,menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireDeviceRepositoryImpl.java

@@ -7,6 +7,7 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import com.zcloud.fire.check.domain.enums.CorpTypeEnum;
+import com.zcloud.fire.check.domain.enums.MenuEnum;
 import com.zcloud.fire.check.domain.enums.UserTypeEnum;
 import com.zcloud.fire.check.persistence.dataobject.*;
 import com.zcloud.fire.check.persistence.mapper.FireDeviceMapper;
@@ -43,7 +44,11 @@ public class FireDeviceRepositoryImpl extends BaseRepositoryImpl<FireDeviceMappe
         } else {
             params.put("corpinfoId", AuthContext.getTenantId());
         }
-        IPage<FireDeviceDO> result = fireDeviceMapper.getFireDevicePage(iPage, params);
+        String menuPerms = "";
+        if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
+            menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
+        }
+        IPage<FireDeviceDO> result = fireDeviceMapper.getFireDevicePage(iPage, params,menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java

@@ -8,6 +8,7 @@ import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import com.zcloud.fire.check.domain.enums.CorpTypeEnum;
 import com.zcloud.fire.check.domain.enums.FireRegionStateEnum;
+import com.zcloud.fire.check.domain.enums.MenuEnum;
 import com.zcloud.fire.check.domain.enums.UserTypeEnum;
 import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO;
 import com.zcloud.fire.check.persistence.dataobject.FirePointDO;
@@ -49,7 +50,11 @@ public class FirePointRepositoryImpl extends BaseRepositoryImpl<FirePointMapper,
             params.put("corpinfoId", AuthContext.getTenantId());
 //            }
         }
-        IPage<FirePointDO> result = firePointMapper.getFirePointPage(iPage, params);
+        String menuPerms = "";
+        if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
+            menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
+        }
+        IPage<FirePointDO> result = firePointMapper.getFirePointPage(iPage, params,menuPerms);
 
 
         return PageHelper.pageToResponse(result, result.getRecords());

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireRegionRepositoryImpl.java

@@ -46,12 +46,11 @@ public class FireRegionRepositoryImpl extends BaseRepositoryImpl<FireRegionMappe
 //            }
         }
         IPage<FireRegionDO> iPage = new Query<FireRegionDO>().getPage(params);
-       /* String menuPerms = "";
+        String menuPerms = "";
         if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
             menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
-        }*/
+        }
-
+        IPage<FireRegionDO> result =fireRegionMapper.getFireRegionPage(iPage,params,menuPerms);
-        IPage<FireRegionDO> result =fireRegionMapper.getFireRegionPage(iPage,params);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
     @Override

web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml

@@ -4,5 +4,14 @@
 
 <mapper namespace="com.zcloud.fire.check.persistence.mapper.CorpInfoMapper">
 
+    <select id="listPage" resultType="com.zcloud.fire.check.persistence.dataobject.CorpInfoDO">
+        select c.*
+        from corp_info c
+        where c.delete_enum = 'FALSE'
+        <if test="params.likeCorpName != null and params.likeCorpName != ''">
+            AND c.corp_name LIKE CONCAT('%',#{params.likeCorpName},'%')
+        </if>
+        order by c.corp_order asc, c.create_time desc
+    </select>
 </mapper>
 

web-infrastructure/src/main/resources/mapper/FireCheckStandardMapper.xml

@@ -13,5 +13,21 @@
         and cli.delete_enum='FALSE'
         group by cli.fire_device_id
     </select>
+
+    <select id="listPage" resultType="com.zcloud.fire.check.persistence.dataobject.FireCheckStandardDO">
+        select cs.*
+        from fire_check_standard cs
+        where cs.delete_enum = 'FALSE'
+        <if test="params.likeFireCheckStandardItem != null and params.likeFireCheckStandardItem != ''">
+           and cs.fire_check_standard_item like concat('%',#{params.likeFireCheckStandardItem},'%')
+        </if>
+        <if test="params.eqFireDeviceType != null and params.eqFireDeviceType != ''">
+           and cs.fire_device_type = #{params.eqFireDeviceType}
+        </if>
+        <if test="params.likeDeviceName != null and params.likeDeviceName != ''">
+           and cs.device_name like concat('%',#{params.likeDeviceName},'%')
+        </if>
+        order by cs.device_name desc,cs.fire_device_type desc,cs.create_time desc
+    </select>
 </mapper>
 

web-infrastructure/src/main/resources/mapper/FireRegionMapper.xml

@@ -8,6 +8,7 @@
         select fr.*,d.name AS departmentName
         from fire_region fr
         left join department d on fr.department_id=d.id
+        left join corp_info c on fr.corpinfo_id = c.id
         <where>
             fr.delete_enum = 'FALSE'
             <if test="params.corpinfoId != null ">