diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalExpeditingController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalExpeditingController.java index 34e67dd..19ead9f 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalExpeditingController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/senior/ProposalExpeditingController.java @@ -103,7 +103,7 @@ public class ProposalExpeditingController { Cnd cnd = Cnd.NEW(); cnd.and("t.taskName", "in", List.of("master_reply", "slave_reply", "opinion_master_reply")); - if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { + if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) { cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java index 5b34eaf..42a9bf1 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java @@ -56,7 +56,7 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl pageData(TeacherCongressDelegateManagePageParam pageForm) { Cnd cnd = buildCondition(pageForm, ""); - if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_TC_ADMIN.name())) { + if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_TC_ADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) { cnd.and("delegationId", "in", proposalCommonService.getSelfManageDelegationIds()); } cnd.asc("id"); diff --git a/src/main/resources/views/platform/sys/user/index.html b/src/main/resources/views/platform/sys/user/index.html index 0f26dba..226939a 100644 --- a/src/main/resources/views/platform/sys/user/index.html +++ b/src/main/resources/views/platform/sys/user/index.html @@ -293,7 +293,11 @@ layout("/layouts/platform.html"){ const url = base + "/platform/sys/unit/tree" self.$axios.post(url, { pid: node.value }).then((res) => { if (res.code === 0) { - resolve(res.data) + let filteredData = res.data; + if (node.level === 0 && res.data && res.data.length > 0) { + filteredData = res.data.slice(1); // 移除第一个元素 + } + resolve(filteredData); } }) } diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html index 9aa2088..fc940c9 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html @@ -140,6 +140,7 @@ layout("/layouts/platform.html"){ 删除