Merge remote-tracking branch 'remotes/origin/dev'

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java

@@ -176,7 +176,11 @@ public enum RequirePermissionEnum {
     /**
      * 项目立项
      */
-    WORK_PROJECT_APPROVAL("work_project_approval","政务管理:项目立项","项目立项");
+    WORK_PROJECT_APPROVAL("work_project_approval","政务管理:项目立项","项目立项"),
+    /**
+     * 基层治理-巡查
+     */
+    WORK_GRASSROOT_GOVERN_PATROL("work_grassroot_govern_patrol","基层治理:巡查","巡查");
 
     private String key;
     private String name;

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -1,6 +1,8 @@
 package com.epmet.dataaggre.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -38,6 +40,7 @@ public class EpmetUserController {
      * @author sun
      */
     @PostMapping("stafflist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.MORE_PATROL_RECORD_LIST)
     public Result<List<StaffListResultDTO>> staffList(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
         if (!"patrolTotal".equals(formDTO.getSortCode()) && !"latestPatrolledTime".equals(formDTO.getSortCode())) {