From 4adca5f634f39ee851b1a2ad9f935be0827f1f45 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Thu, 26 Feb 2026 15:31:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(fire-check):=20=E6=B7=BB=E5=8A=A0=E7=82=B9?=
 =?UTF-8?q?=E6=A3=80=E8=AE=B0=E5=BD=95=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=92=8C=E8=8F=9C=E5=8D=95=E8=B7=AF=E5=BE=84=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fire/check/app/AppFireCheckListController.java     |  2 ++
 .../zcloud/fire/check/dto/CheckListRecordPageQry.java  |  2 ++
 .../check/persistence/mapper/FireCheckListMapper.java  |  3 ++-
 .../repository/impl/FireCheckListRepositoryImpl.java   | 10 +++++++---
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java
index c3e85b1..a02fd6c 100644
--- a/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java
+++ b/web-adapter/src/main/java/com/zcloud/fire/check/app/AppFireCheckListController.java
@@ -10,6 +10,7 @@ import com.zcloud.fire.check.dto.clientobject.*;
 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 AppFireCheckListController {
 
     @ApiOperation(value = "点检记录首页-点检表查询")
     @PostMapping("/getCheckListRecord")
+    @PreAuthorize("@pms.hasAnyPermission('dwjcjl')")
     public PageResponse<FireCheckListCO> getCheckListRecord(@RequestBody CheckListRecordPageQry qry) {
         return fireCheckListService.getCheckListRecord(qry);
     }
diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/CheckListRecordPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/CheckListRecordPageQry.java
index 115051b..19175b7 100644
--- a/web-client/src/main/java/com/zcloud/fire/check/dto/CheckListRecordPageQry.java
+++ b/web-client/src/main/java/com/zcloud/fire/check/dto/CheckListRecordPageQry.java
@@ -47,5 +47,7 @@ public class CheckListRecordPageQry extends PageQuery {
     @ApiModelProperty(value = "结束时间")
     private String endTime;
 
+    private String menuPath;
+
 }
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java
index bd1b16e..ad5df5d 100644
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java
@@ -24,6 +24,7 @@ import java.util.Map;
 @DataScopes({
         @DataScope(method = "listPage", menuPerms = ""),
         @DataScope(method = "checkListRecordList", menuPerms = ""),
+        @DataScope(method = "getCheckListRecord", menuPerms = ""),
 })
 public interface FireCheckListMapper extends BaseMapper<FireCheckListDO> {
 
@@ -43,6 +44,6 @@ public interface FireCheckListMapper extends BaseMapper<FireCheckListDO> {
 
     IPage<FireCheckListDO> checkListRecordList(IPage<FireCheckListDO> iPage, Map<String, Object> params, DateTimeE dateTimeE, String menuPerms);
 
-    IPage<FireCheckListDO> getCheckListRecord(IPage<FireCheckListDO> iPage, Map<String, Object> params, DateTimeE dateTimeE);
+    IPage<FireCheckListDO> getCheckListRecord(IPage<FireCheckListDO> iPage, Map<String, Object> params, DateTimeE dateTimeE, String menuPerms);
 }
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java
index 1a210b8..59e9f8e 100644
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java
@@ -159,15 +159,19 @@ public class FireCheckListRepositoryImpl extends BaseRepositoryImpl<FireCheckLis
         } else {
             if(!corpInfoRepository.isSupper()){
                 params.put("corpinfoId", AuthContext.getTenantId());
-                if(!CorpInfoE.isCorp()){
+              /*  if(!CorpInfoE.isCorp()){
                     //是个人，只能查询自己的清单
                     params.put("userId", AuthContext.getUserId());
-                }
+                }*/
             }
         }
         FireCheckListE fireCheckListE = new FireCheckListE();
         DateTimeE dateTimeE = fireCheckListE.getCheckRecordInterval(null);
-        IPage<FireCheckListDO> result = fireCheckListMapper.getCheckListRecord(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.getCheckListRecord(iPage, params,dateTimeE,menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
 
     }