From ef2a834216d9336b59d47c5a6e22605dcdbafdd0 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Tue, 13 Jan 2026 08:38:04 +0800
Subject: [PATCH] =?UTF-8?q?bug=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/senior/ProposalExpeditingController.java     | 2 +-
 .../service/TeacherCongressDelegateServiceImpl.java         | 2 +-
 src/main/resources/views/platform/sys/user/index.html       | 6 +++++-
 .../democratic/teachercongress/delegate/push/index.html     | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

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<Teacher_
     @Override
     public Pagination<Teacher_congress_delegate> 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"){
                             <el-button
                                     v-else-if="row.taskKey === 'startTask'
                                 || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080'
+                                || row.taskKey=== null
                                 || row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62' || !row.instanceId"
                                     @click="onDelete(row.id)"
                                     size="mini" type="danger">删除