From 70354770f280c7ac742742cbbb9e4c1c0c42e9ba Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 25 Sep 2025 20:41:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E8=A8=80=E7=8C=AE=E7=AD=96=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SuggestionBoxMineController.java | 5 +++-- .../controller/SuggestionBoxQueryController.java | 9 +++++---- .../controller/SuggestionBoxWriteController.java | 9 +++++---- .../controller/SuggestionXghController.java | 5 +++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java index 1bd9cc9a..d848963c 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxMineController.java @@ -2,6 +2,7 @@ package com.budwk.app.zhgh.democratic.suggestionBox.controller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; @@ -53,7 +54,7 @@ public class SuggestionBoxMineController { @At - @SaCheckPermission("suggestionBox.mine") + @SaCheckPermission(value = {"suggestionBox.mine", "h5.suggestionBox.mine"}, mode = SaMode.OR) public Result pageData(Integer pageNumber, Integer pageSize, String searchKeyword, Integer year) { Sql sql = Sqls.create(""" SELECT @@ -100,7 +101,7 @@ public class SuggestionBoxMineController { } @At - @SaCheckPermission("suggestionBox.mine") + @SaCheckPermission(value = {"suggestionBox.mine", "h5.suggestionBox.mine"}, mode = SaMode.OR) @Aop(TransAop.READ_COMMITTED) @ApiOperation("删除") @SLog(tag = "建言献策-我的申请", msg = "删除") diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxQueryController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxQueryController.java index 64fdf06b..5e57190e 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxQueryController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxQueryController.java @@ -2,6 +2,7 @@ package com.budwk.app.zhgh.democratic.suggestionBox.controller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; @@ -44,14 +45,14 @@ public class SuggestionBoxQueryController { @At @Ok("beetl:/platform/zhghh5/democratic/suggestionBox/query/index.html") - @SaCheckPermission("suggestionBox.query") - public void h5Index() { + @SaCheckPermission("h5.suggestionBox.query") + public void h5() { } @At - @SaCheckPermission("suggestionBox.query") + @SaCheckPermission(value = {"suggestionBox.query", "h5.suggestionBox.query"}, mode = SaMode.OR) public Result pageData(Integer pageNumber, Integer pageSize, String searchKeyword, Integer year) { Sql sql = Sqls.create(""" SELECT @@ -97,7 +98,7 @@ public class SuggestionBoxQueryController { } @At - @SaCheckLogin + @SaCheckPermission(value = {"suggestionBox.query", "h5.suggestionBox.query"}, mode = SaMode.OR) @Aop(TransAop.READ_COMMITTED) @ApiOperation("删除") public Result delete(@Param("id") String id) { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java index 83671494..cec1d211 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxWriteController.java @@ -2,6 +2,7 @@ package com.budwk.app.zhgh.democratic.suggestionBox.controller; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.lang.Dict; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.result.Result; @@ -55,7 +56,7 @@ public class SuggestionBoxWriteController { } @At - @SaCheckPermission("suggestionBox.write") + @SaCheckPermission(value = {"suggestionBox.write", "h5.suggestionBox.write"}, mode = SaMode.OR) @ApiOperation("保存申请") @SLog(tag = "建言献策-填写申请", msg = "保存申请") public Result save(@Param("data") SuggestionBox suggestionBox) { @@ -66,7 +67,7 @@ public class SuggestionBoxWriteController { @At - @SaCheckPermission("suggestionBox.write") + @SaCheckPermission(value = {"suggestionBox.write", "h5.suggestionBox.write"}, mode = SaMode.OR) @ApiOperation("提交申请") @Aop(TransAop.READ_COMMITTED) @SLog(tag = "建言献策-填写申请", msg = "提交申请") @@ -88,7 +89,7 @@ public class SuggestionBoxWriteController { } @At - @SaCheckPermission("suggestionBox.write") + @SaCheckPermission(value = {"suggestionBox.write", "h5.suggestionBox.write"}, mode = SaMode.OR) @ApiOperation("重新提交申请") @Aop(TransAop.READ_COMMITTED) @SLog(tag = "建言献策-填写申请", msg = "重新提交申请") @@ -103,7 +104,7 @@ public class SuggestionBoxWriteController { } @At - @SaCheckPermission("suggestionBox.write") + @SaCheckPermission(value = {"suggestionBox.write", "h5.suggestionBox.write"}, mode = SaMode.OR) @ApiOperation("获取申请信息") public Result info(@Param("id") String id) { SuggestionBox box = dao.fetch(SuggestionBox.class, id); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java index 0c03cc0f..e85b1870 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.democratic.suggestionBox.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; @@ -49,7 +50,7 @@ public class SuggestionXghController { @At - @SaCheckPermission("suggestionBox.xgh") + @SaCheckPermission(value = {"suggestionBox.xgh", "h5.suggestionBox.xgh"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, String taskId, String searchKeyword, Integer year, boolean approval) { Sql sql = Sqls.create(""" SELECT @@ -114,7 +115,7 @@ public class SuggestionXghController { } @At - @SaCheckPermission("suggestionBox.xgh") + @SaCheckPermission(value = {"suggestionBox.xgh", "h5.suggestionBox.xgh"}, mode = SaMode.OR) @ApiOperation("查询任务") public Result queryTask(@Valid @Param("taskId") String taskId) { Sql sql = Sqls.create("""