From cb7a555aaf509d3cc0b9b649b325585776cfc385 Mon Sep 17 00:00:00 2001 From: dd3s_206 Date: Sat, 16 May 2026 15:39:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E6=A1=88=E7=AE=A1=E7=90=86-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BB=9F=E8=AE=A1=EF=BC=9A=20=E5=9B=A2=E9=95=BF?= =?UTF-8?q?=E7=9C=8B=E8=87=AA=E5=B7=B1=E5=9B=A2=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/ProposalQueryDelegationController.java | 8 ++++++++ .../zhgh/democratic/proposal/query/delegation/index.html | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryDelegationController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryDelegationController.java index 9561967..ec4a6f6 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryDelegationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryDelegationController.java @@ -8,6 +8,7 @@ import com.budwk.app.sys.models.Sys_dict; import com.budwk.app.sys.services.SysDictService; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.zhgh.democratic.proposal.param.ProposalSearchParam; +import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -35,6 +36,9 @@ public class ProposalQueryDelegationController { @Inject private SysDictService sysDictService; + @Inject + private ProposalCommonService proposalCommonService; + @At("") @Ok("beetl:/platform/zhgh/democratic/proposal/query/delegation/index.html") @@ -66,6 +70,7 @@ public class ProposalQueryDelegationController { Cnd cnd = Cnd.NEW(); cnd.andEX("dbt.sessionId", "=", sessionId); if (!AuthUtil.hasRoleOr("SYSADMIN", "SCHOOL_UNION_ADMIN")) { + cnd.and("dbt.id", "in", proposalCommonService.getSelfManageDelegationIds()); } cnd.asc("dbt.`code`"); sql.setCondition(cnd); @@ -101,6 +106,9 @@ public class ProposalQueryDelegationController { $condition """); Cnd cnd = Cnd.NEW(); + if (!AuthUtil.hasRoleOr("SYSADMIN", "SCHOOL_UNION_ADMIN")) { + cnd.and("info.delegationId", "in", proposalCommonService.getSelfManageDelegationIds()); + } ProposalSearchParam.buildSearch(cnd, pageForm); cnd.groupBy("info.id"); sql.setCondition(cnd); diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/query/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/query/delegation/index.html index 66d922a..0423289 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/query/delegation/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/query/delegation/index.html @@ -13,7 +13,7 @@ layout("/layouts/platform.html"){ - +