commit

src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java

@@ -102,7 +102,6 @@ public class ActivityBasicScopeController {
      * @return {@link Result}
      */
     @At
-    @SaCheckPermission("activity.basic")
     public Result pageData(@Param("data") ActivityUserScopePageParam pageForm) {
         Sql sql = Sqls.create("""
                 SELECT
@@ -221,6 +220,7 @@ public class ActivityBasicScopeController {
         return Result.success(new NutMap() {{
             addv("is_A06", StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name()));
             addv("is_H04", StpUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()));
+            addv("is_H02", StpUtil.hasRole(RoleConstant.SCHOOL_UNION_CLUB_ADMIN.name()));
             addv("is_CLUB_PRESIDENT", StpUtil.hasRole(RoleConstant.CLUB_PRESIDENT.name()));
             addv("is_sysadmin", StpUtil.hasRole(RoleConstant.SYSADMIN.name()));
             addv("unionid", SecurityUtil.getUnionId());

src/main/java/com/budwk/app/zhgh/club/controller/common/ClubCommonController.java

@@ -57,7 +57,7 @@ public class ClubCommonController {
     @SaCheckLogin
     public Result listClubByRole() {
         Cnd cnd = Cnd.NEW();
-        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SCHOOL_UNION_CLUB_ADMIN.name())) {
             // 报销申请只允许选择当前用户已加入的协会，避免看到未加入的协会数据。
             List<ClubUser> clubUsers = sysClubService.dao().query(ClubUser.class, Cnd.where("userId", "=", SecurityUtil.getUserId()));
             List<String> myClubId = clubUsers.stream().map(ClubUser::getClubId).distinct().toList();