From 1d36003f9c28ea53f955b8f667527e0219826243 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Tue, 23 Dec 2025 15:28:24 +0800
Subject: [PATCH] commit

---
 .../service/TeacherCongressDelegateServiceImpl.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 3402a56..fe65816 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_ADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_TC_ADMIN.name())) {
             cnd.and("delegationId", "in", proposalCommonService.getSelfManageDelegationIds());
         }
         cnd.asc("id");
@@ -88,7 +88,7 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl<Teacher_
                 $condition
                 """);
         Cnd cnd = buildCondition(pageForm, "t1.");
-        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_ADMIN.name()) && !AuthUtil.hasRole(RoleConstant.SCHOOL_UNION_TC_ADMIN.name())) {
             cnd.and("t1.delegationId", "in", proposalCommonService.getSelfManageDelegationIds());
         }
 
@@ -173,9 +173,9 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl<Teacher_
                     delegateGroupList.get(i).get(j).put("username" + j, delegateGroupList.get(i).get(j).getString("userName"));
                     delegateGroupList.get(i).get(j).put("sex" + j, delegateGroupList.get(i).get(j).getString("sex"));
                     buildMap.put("username" + j, delegateGroupList.get(i).get(j).getString("userName"));
-                    if(StrUtil.isNotBlank(delegateGroupList.get(i).get(j).getString("sex"))) {
-						buildMap.put("sex" + j, "(" + delegateGroupList.get(i).get(j).getString("sex") + ")");
-					}
+                    if (StrUtil.isNotBlank(delegateGroupList.get(i).get(j).getString("sex"))) {
+                        buildMap.put("sex" + j, "(" + delegateGroupList.get(i).get(j).getString("sex") + ")");
+                    }
                 }
                 buildMaps.add(buildMap);
             }