From 010e3cfc6b93ba9f47766448887b8ba358b1c89e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 26 Mar 2024 15:59:43 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TbMemberProjectFileController.java          | 17 +++++++----------
 .../TbMemberProjectSubitemController.java       | 17 ++++++++++-------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectFileController.java
index 39592824..e8c884a7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectFileController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectFileController.java
@@ -21,6 +21,7 @@ import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.project.entity.PayWorkingGroupDataFile;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.apache.commons.lang3.StringUtils;
@@ -57,6 +58,7 @@ public class TbMemberProjectFileController extends JeroController<TbMemberProjec
     /**
      * 分页列表查询
      */
+    @RequiresPermissions("memberOtherDetails:search")
     @ApiOperation(value = "标协会员项目其他资料-分页列表查询", notes = "标协会员项目其他资料-分页列表查询")
     @GetMapping(value = "/page")
     public Result<IPage<TbMemberProjectFile>> queryPageList(TbMemberProjectFile tbMemberProjectFile,
@@ -71,6 +73,7 @@ public class TbMemberProjectFileController extends JeroController<TbMemberProjec
     /**
      * 列表查询
      */
+    @RequiresPermissions("memberOtherDetails:search")
     @ApiOperation(value = "标协会员项目其他资料-列表查询", notes = "标协会员项目其他资料-列表查询")
     @GetMapping(value = "/list")
     public Result<List<TbMemberProjectFile>> queryList(TbMemberProjectFile tbMemberProjectFile,
@@ -83,6 +86,7 @@ public class TbMemberProjectFileController extends JeroController<TbMemberProjec
     /**
      * 添加
      */
+    @RequiresPermissions("memberOtherDetails:add")
     @AutoLog(value = "标协会员项目其他资料-添加")
     @ApiOperation(value = "标协会员项目其他资料-添加", notes = "标协会员项目其他资料-添加")
     @PostMapping(value = "/add")
@@ -91,20 +95,11 @@ public class TbMemberProjectFileController extends JeroController<TbMemberProjec
         return Result.OK("添加成功！");
     }
 
-    /**
-     * 编辑
-     */
-    @AutoLog(value = "标协会员项目其他资料-编辑")
-    @ApiOperation(value = "标协会员项目其他资料-编辑", notes = "标协会员项目其他资料-编辑")
-    @PostMapping(value = "/edit")
-    public Result<String> edit(@Validated @RequestBody TbMemberProjectFile tbMemberProjectFile) {
-        tbMemberProjectFileService.editById(tbMemberProjectFile);
-        return Result.OK("编辑成功!");
-    }
 
     /**
      * 通过id删除
      */
+    @RequiresPermissions("memberOtherDetails:delete")
     @AutoLog(value = "标协会员项目其他资料-通过id删除")
     @ApiOperation(value = "标协会员项目其他资料-通过id删除", notes = "标协会员项目其他资料-通过id删除")
     @PostMapping(value = "/delete")
@@ -116,6 +111,7 @@ public class TbMemberProjectFileController extends JeroController<TbMemberProjec
     /**
      * 批量删除
      */
+    @RequiresPermissions("memberOtherDetails:batchDel")
     @AutoLog(value = "标协会员项目其他资料-批量删除")
     @ApiOperation(value = "标协会员项目其他资料-批量删除", notes = "标协会员项目其他资料-批量删除")
     @PostMapping(value = "/deleteBatch")
@@ -141,6 +137,7 @@ public class TbMemberProjectFileController extends JeroController<TbMemberProjec
     /**
      * 导出excel
      */
+    @RequiresPermissions("memberOtherDetails:export")
     @ApiOperation(value = "标协会员项目其他资料-导出excel")
     @GetMapping(value = "/exportXls")
     public void exportXls(HttpServletRequest request,HttpServletResponse response, TbMemberProjectFile tbMemberProjectFile) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
index bb14bd97..a30858b8 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
@@ -99,7 +99,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	 /**
 	  * 添加
 	  */
-	 //@RequiresPermissions(":add")
+	 @RequiresPermissions("safeguardStardsMember:add")
 	 @AutoLog(value = "标协会员项目成员-添加")
 	 @ApiOperation(value = "标协会员项目成员-添加", notes = "标协会员项目成员-添加")
 	 @PostMapping(value = "/add")
@@ -111,7 +111,6 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	 /**
 	  * 添加
 	  */
-	 //@RequiresPermissions(":add")
 	 @AutoLog(value = "标协会员项目成员-申请入会")
 	 @ApiOperation(value = "标协会员项目成员-申请入会")
 	 @PostMapping(value = "/application")
@@ -123,7 +122,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	 /**
 	  * 编辑
 	  */
-	 //@RequiresPermissions(":add")
+	 @RequiresPermissions("safeguardStardsMember:add")
 	 @AutoLog(value = "标协会员项目成员-编辑")
 	 @ApiOperation(value = "标协会员项目成员-编辑", notes = "标协会员项目成员-编辑")
 	 @PostMapping(value = "/edit")
@@ -137,7 +136,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	 /**
 	  * 删除
 	  */
-	 //@RequiresPermissions(":add")
+	 @RequiresPermissions("safeguardStardsMember:delete")
 	 @AutoLog(value = "标协会员项目成员-删除")
 	 @ApiOperation(value = "标协会员项目成员-删除", notes = "标协会员项目成员-删除")
 	 @GetMapping(value = "/delete")
@@ -149,7 +148,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	 /**
 	  * 批量删除
 	  */
-	 //@RequiresPermissions(":add")
+	 @RequiresPermissions("safeguardStardsMember:batchDel")
 	 @AutoLog(value = "标协会员项目成员-批量删除")
 	 @ApiOperation(value = "标协会员项目成员-批量删除", notes = "标协会员项目成员-批量删除")
 	 @GetMapping(value = "/deleteBatch")
@@ -158,6 +157,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 		 return Result.OK("批量删除成功！");
 	 }
 
+	 @RequiresPermissions("safeguardStardsMember:drawTicket")
 	 @AutoLog(value = "标协会员项目成员-提票")
 	 @ApiOperation(value = "标协会员项目成员-提票")
 	 @GetMapping(value = "/ticketCollection")
@@ -166,6 +166,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 		 return Result.OK("提票成功！");
 	 }
 
+	 @RequiresPermissions("safeguardStardsMember:editMemberEquity")
 	 @AutoLog(value = "标协会员项目成员-编辑会员权益")
 	 @ApiOperation(value = "标协会员项目成员-编辑会员权益")
 	 @PostMapping(value = "/editMemberBenefits")
@@ -174,6 +175,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 		 return Result.OK("编辑会员权益成功！");
 	 }
 
+	 @RequiresPermissions("safeguardStardsMember:copy")
 	 @AutoLog(value = "标协会员项目成员-复制")
 	 @ApiOperation(value = "标协会员项目成员-复制")
 	 @PostMapping(value = "/copy")
@@ -182,6 +184,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 		 return Result.OK("编辑会员权益成功！");
 	 }
 
+	 @RequiresPermissions("safeguardStardsMember:batchCopy")
 	 @AutoLog(value = "标协会员项目成员-批量复制")
 	 @ApiOperation(value = "标协会员项目成员-批量复制")
 	 @PostMapping(value = "/copyBatch")
@@ -221,7 +224,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	  * 导入excel
 	  */
 	 @ApiOperation(value = "导入")
-	 @RequiresPermissions("safeguardStardsMember:export")
+	 @RequiresPermissions("safeguardStardsMember:import")
 	 @GetMapping(value = "/importXls")
 	 public Result<Object> importXls(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem) {
 		 String projectId = tbMemberProjectSubitem.getProjectId();
@@ -263,7 +266,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	  * 导出excel模板
 	  */
 	 @ApiOperation(value = "导出模板")
-	 @RequiresPermissions("safeguardStardsMember:export")
+	 @RequiresPermissions("safeguardStardsMember:downloadTemplate")
 	 @GetMapping(value = "/exportTemplate")
 	 public ModelAndView exportTemplate() {
 		 return super.exportTemplate(TbMemberProjectSubitemExcel.class, "标协会员项目成员表");