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();

src/main/resources/static/components/module/activity/UserScope.vue

@@ -15,6 +15,7 @@
               placeholder="输入工号或者姓名查询"
               :remote-method="queryUser"
               @change="doSearch"
+              @clear="doSearch"
               style="width: 100%"
             >
               <el-option
@@ -150,7 +151,7 @@
           <el-col class="query-content">
             <el-select
               v-model="pageForm.unionIds"
-              :clearable="is_A06 || is_sysadmin"
+              clearable
               collapse-tags
               filterable
               multiple
@@ -183,6 +184,7 @@
                     placeholder="请选择角色"
                     style="width: 100%"
                     @change="doSearch"
+                    @clear="doSearch"
                   >
                     <el-option
                       v-for="item in roleList"
@@ -199,6 +201,7 @@
                     placeholder="请选择教代会"
                     style="width: 100%"
                     @change="doSearch"
+                    @clear="doSearch"
                   >
                     <el-option
                       v-for="item in sessionOptions"
@@ -213,16 +216,17 @@
           </el-row>
         </template>
 
-        <el-row class="query-row" v-if="is_A06 || is_sysadmin || is_H02">
+        <el-row class="query-row" v-if="is_A06 || is_sysadmin || is_H02 || is_CLUB_PRESIDENT">
           <el-col class="query-title">社团：</el-col>
           <el-col class="query-content">
             <el-select
               v-model="pageForm.clubId"
-              :clearable="is_A06 || is_sysadmin || (is_H04 && is_H02)"
+              clearable
               filterable
               placeholder="请选择社团"
               style="width: 100%"
               @change="doSearch"
+              @clear="doSearch"
             >
               <el-option
                 v-for="item in clubOptions"
@@ -243,6 +247,7 @@
               placeholder="请选择活动组别范围之外的人员"
               style="width: 100%"
               @change="handleActivityGroupChange"
+              @clear="handleActivityGroupChange('')"
             >
               <el-option
                 v-for="item in activityGroupList2"
@@ -485,6 +490,9 @@ module.exports = {
     is_H02() {
       return this.roleData.is_H02
     },
+    is_CLUB_PRESIDENT() {
+      return this.roleData.is_CLUB_PRESIDENT
+    },
     is_sysadmin() {
       return this.roleData.is_sysadmin
     },
@@ -509,7 +517,8 @@ module.exports = {
       }
     },
     getInitialUnionIds() {
-      if ((this.is_sysadmin || this.is_A06 || this.is_H02) === false && this.is_H04 === true && this.unionid) {
+      // 分工会和社团双身份默认不带分工会筛选，保证初始列表走后端并集逻辑。
+      if ((this.is_sysadmin || this.is_A06 || this.is_H02 || this.is_CLUB_PRESIDENT) === false && this.is_H04 === true && this.unionid) {
         return [this.unionid]
       }
       return []
@@ -711,14 +720,15 @@ module.exports = {
   async created() {
     this.listSession()
     await this.getRolesAndUnion()
-    this.clubOptions = await this.$businessTool.listClubByRole()
+    this.clubOptions = (this.is_sysadmin || this.is_A06)
+      ? await this.$businessTool.listClubByRole()
+      : this.is_CLUB_PRESIDENT
+        ? await this.$businessTool.listManageClubByRole()
+        : await this.$businessTool.listClubByRole()
     this.unions = (this.is_sysadmin || this.is_A06 || this.is_H02)
       ? await this.$businessTool.listUnion()
       : this.$businessTool.listUnion(this.unionid)
     this.pageForm.unionIds = this.getInitialUnionIds()
-    if (!this.is_H04 && this.is_H02 && this.clubOptions.length > 0) {
-      this.$set(this.pageForm, "clubId", this.clubOptions[0].id)
-    }
     await this.getActivityGroup()
     this.personTypeOptions = await this.$businessTool.getDictOptions("USER_PERSON_TYPE")
     this.userStateOptions = await this.$businessTool.getDictOptions("USER_STATE")