From 4b67eb8b783bc66cc3bcebb92ed054cb16e18d2c Mon Sep 17 00:00:00 2001
From: hongqiwei <1143662660@qq.com>
Date: Sat, 10 Oct 2026 15:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=B7=A5=E4=BC=9A=E5=A7=94=E5=91=98?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BB=A3=E6=8A=A5=E5=90=8D=EF=BC=8C=E5=8F=8A?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=9C=A8=E6=B4=BB=E5=8A=A8=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E5=86=85=E4=B9=9F=E5=8F=AF=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActivitySportsApplyUserServiceImpl.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java
index be56686..356a079 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java
@@ -131,8 +131,9 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl<Activity
                 """).setParam("unionId", pageParam.getUnionId()).setParam("userId", SecurityUtil.getUserId());
 
 
+        // 分工会委员作为代报操作人，查看项目时不要求其本人在活动报名范围内。
         if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(),
-                RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
+                RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_WY.name())) {
 //            cnd.where().andLike("school.applyWay ", "1");
             cnd.and(new Static("(SELECT COUNT(1)  FROM activity_user_scope WHERE groupId=school.activityGroupId AND userId='%s') >0".formatted(SecurityUtil.getUserId())));
 
@@ -209,8 +210,9 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl<Activity
             cnd.and(new Static("(SELECT COUNT(1) FROM activity_school_apply WHERE activityId=school.id AND userId='%s')>0".formatted(SecurityUtil.getUserId())));
         }
 
+        // 活动入口与项目列表保持一致，避免代报人能打开活动却看不到报名项目。
         if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(),
-                RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
+                RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_WY.name())) {
 //            cnd.and(new Static("JSON_CONTAINS(school.applyWay,JSON_ARRAY( 1))>0"));
             cnd.and(new Static("(SELECT COUNT(1)  FROM activity_user_scope WHERE groupId=school.activityGroupId AND userId='%s') >0".formatted(SecurityUtil.getUserId())));
         }