Merge branch 'refs/heads/feature_界面UI优化' into feature_主分支合并UI优化

# Conflicts: # src/main/resources/views/platform/zhghh5/democratic/proposal/query/comprehensive/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/index.html
2026-08-25 10:17:05 +08:00
parent 33252a7225 34726c2b11
commit e83f1317a4
152 changed files with 23840 additions and 4968 deletions
@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.democratic.proposal.controller.transact;

 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.ExportTableColumns;
@@ -55,8 +56,17 @@ public class ProposalCaseCheckController {
    public void index() {
    }

+    /**
+     * 打开提案委员会审查手机端列表页。
+     */
+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/caseCheck/index.html")
+    @SaCheckPermission("h5.proposal.caseCheck")
+    public void h5Index() {
+    }
+
    @At
-    @SaCheckPermission("proposal.caseCheck")
+    @SaCheckPermission(value = {"proposal.caseCheck", "h5.proposal.caseCheck"}, mode = SaMode.OR)
    @ApiOperation("分页列表")
    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
        Sql sql = Sqls.create("""
@@ -129,7 +139,7 @@ public class ProposalCaseCheckController {
    }

    @At
-    @SaCheckPermission("proposal.caseCheck")
+    @SaCheckPermission(value = {"proposal.caseCheck", "h5.proposal.caseCheck"}, mode = SaMode.OR)
    @ApiOperation("查询当前提案承办单位")
    public Result listReplyUnits(String proposalId) {
        return Result.success(proposalCaseCheckService.listReplyUnits(proposalId));
@@ -49,7 +49,6 @@ public class ProposalCommissionerController {
    public void h5Index() {
    }

-
    @At
    @SaCheckPermission("proposal.commissioner")
    public Result pageData(@Valid ProposalSearchParam pageForm, boolean approval) {
@@ -64,7 +64,6 @@ public class ProposalDelegationController {
    public void h5Index() {
    }

-
    @At
    @SaCheckPermission("proposal.delegation")
    @ApiOperation("分页列表")
@@ -52,7 +52,6 @@ public class ProposalFeedbackEvaluationController {
    public void h5Index() {
    }

-
    @At
    @SaCheckPermission("proposal.feedbackEvaluation")
    @ApiOperation("分页列表")
@@ -52,6 +52,11 @@ public class ProposalPreAuditController {
    public void index() {
    }

+    @At("/h5")
+    @Ok("beetl:/platform/zhghh5/democratic/proposal/transact/preAudit/index.html")
+    @SaCheckPermission("proposal.preAudit")
+    public void h5Index() {
+    }

    @At
    @SaCheckPermission("proposal.preAudit")
@@ -74,7 +74,6 @@ public class ProposalSchoolLeaderApprovalController {
    public void h5Index() {
    }

-
    @At
    @SaCheckPermission("proposal.schoolLeaderApproval")
    @ApiOperation("分页列表")