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"){ - +