From 4eb3b5e5a5c5587803a939c3bced81e0ce132ef9 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Thu, 11 Jul 2024 09:18:26 +0800
Subject: [PATCH] =?UTF-8?q?update:=E8=A1=A5=E5=85=85=E5=B7=B2=E6=9C=89?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/24年6月变更.sql                                        | 2 +-
 .../member/controller/AnnualMemberProjectController.java  | 4 ++--
 .../jero/member/service/IAnnualMemberProjectService.java  | 8 ++++----
 .../project/controller/PayWorkingGroupController.java     | 2 +-
 .../controller/PayWorkingGroupSubItemController.java      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql
index c6b32760..2ee65d5c 100644
--- a/db/24年6月变更.sql
+++ b/db/24年6月变更.sql
@@ -162,7 +162,7 @@ ALTER TABLE `tb_member_project_subitem`
 
 -- 20240708 工作组表新增自定义排序字段
 ALTER TABLE `pay_working_group`
-    add column sort_no int comment '自定义排序顺序'
+    add column sort_no int comment '自定义排序顺序';
 
 -- 20240710 新增会议酒店推荐表
 DROP TABLE IF EXISTS `pay_meeting_hotel_recommend`;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java
index 59e23b89..d9cc224f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/AnnualMemberProjectController.java
@@ -39,7 +39,7 @@ public class AnnualMemberProjectController extends JeroController<TbMemberProjec
     /**
      * 分页列表查询
      */
-//    @RequiresPermissions("safeguardStardsMember:search")
+    @RequiresPermissions("memberStatistic:search")
     @ApiOperation(value="年度会员维护-分页列表查询", notes="年度会员维护-分页列表查询")
     @GetMapping(value = "/page")
     public Result<IPage<TbMemberProjectSubitem>> queryPageList(TbMemberProjectSubitem tbMemberProjectSubitem,
@@ -55,7 +55,7 @@ public class AnnualMemberProjectController extends JeroController<TbMemberProjec
      * 导出excel
      */
     @ApiOperation(value = "导出")
-//    @RequiresPermissions("safeguardStardsMember:export")
+    @RequiresPermissions("memberStatistic:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest req, TbMemberProjectSubitem tbMemberProjectSubitem) {
         List<TbMemberProjectSubitem> pageList = annualMemberProjectService.pageList(req, tbMemberProjectSubitem);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java
index 22ebb539..df513b1c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IAnnualMemberProjectService.java
@@ -56,10 +56,10 @@ public class IAnnualMemberProjectService {
             queryWrapper.eq("year(effective_date)",effectiveDate.year());
             queryWrapper.eq("month(effective_date)",effectiveDate.month()+1);
         }
-//        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//        if (!rolePermissionService.getRolePermission("safeguardStardsMember:search")) {
-//            queryWrapper.eq("tmp.director_id",sysUser.getId());
-//        }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (!rolePermissionService.getRolePermission("memberStatistic:search")) {
+            queryWrapper.eq("tmp.director_id",sysUser.getId());
+        }
         return queryWrapper;
     }
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
index 63b81a0e..39bffc0d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
@@ -466,7 +466,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
  	  * @param request
 	  * @param response
 	  */
-//	 @RequiresPermissions("workingGroupProject:exportAllFile")
+	 @RequiresPermissions("workingGroupMember:exportAllFile")
 	 @ApiOperation(value="全部文件导出", notes="全部文件导出")
 	 @GetMapping(value = "/exportAllFile")
 	 public void exportAllFile(HttpServletRequest request, HttpServletResponse response) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index d63389b2..e80d6876 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -960,7 +960,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 	  * @return
 	  */
 	 @AutoLog(value = "确认凭证",operateType = 2)
-//	 @RequiresPermissions("workingGroupMember:confirmVoucher")
+	 @RequiresPermissions("workingGroupMember:confirmVoucher")
 	 @GetMapping(value = "/confirmVoucher")
 	 @ApiOperation(value = "工作组成员-确认凭证")
 	 public Result<?> confirmVoucher(@RequestParam(name = "id") String id) {