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 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 { @@ -43,6 +44,6 @@ public interface FireCheckListMapper extends BaseMapper { IPage checkListRecordList(IPage iPage, Map params, DateTimeE dateTimeE, String menuPerms); - IPage getCheckListRecord(IPage iPage, Map params, DateTimeE dateTimeE); + IPage getCheckListRecord(IPage iPage, Map 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 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 result = fireCheckListMapper.getCheckListRecord(iPage, params,dateTimeE,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); }