From c5df88bd9271f7587a572b6e4a101a7d95cc7143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com>
Date: Fri, 11 Sep 2026 16:14:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=8F=E4=BC=9A=E4=BC=9A=E9=95=BF?=
 =?UTF-8?q?=E7=AD=89=E8=A7=92=E8=89=B2=E6=94=B9=E4=B8=BA=20=E5=8D=8F?=
 =?UTF-8?q?=E4=BC=9A=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infoManage/ClubInfoManageController.java  |  2 +-
 .../impl/SysClubInfoManageServiceImpl.java    |  2 +-
 .../club/infoManage/manage/clubInfoManage.js  | 20 ++++---------------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java
index fa3ec42..7688297 100644
--- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java
+++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubInfoManageController.java
@@ -295,7 +295,7 @@ public class ClubInfoManageController {
             ClubUser clubUser = dao.fetch(ClubUser.class, Cnd.where("clubId", "=", clubId).and("userId", "=", user));
             if(clubUser != null) {
                 List<String> roleCodeList = clubUser.getRoleCode();
-                if (List.of(RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_VICE_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name(), RoleConstant.CLUB_VICE_SECRETARY.name(), RoleConstant.CLUB_OPERATOR.name()).contains(roleCode)) {
+                if (List.of(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_VICE_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name(), RoleConstant.CLUB_VICE_SECRETARY.name(), RoleConstant.CLUB_OPERATOR.name()).contains(roleCode)) {
                     roleCodeList.remove(RoleConstant.CLUB_MEMBER.name());
                 }
                 if(!roleCodeList.contains(roleCode)) {
diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java
index 33866aa..18ffa08 100644
--- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java
@@ -115,7 +115,7 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl<ClubCommonPage
         cnd.and("ins.state", "=", ProcessInstanceStateEnum.FINISHED.getCode());
         // 校工会主席在协会管理界面按校级管理角色查看全部协会。
         if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SCHOOL_UNION_CLUB_ADMIN.name(), RoleConstant.SCHOOL_UNION_CHAIRMAN.name())) {
-            List<String> roleList = commonService.findUserRoleByRoleCode(List.of(RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_VICE_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name(), RoleConstant.CLUB_VICE_SECRETARY.name(), RoleConstant.CLUB_OPERATOR.name()));
+            List<String> roleList = commonService.findUserRoleByRoleCode(List.of(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_VICE_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name(), RoleConstant.CLUB_VICE_SECRETARY.name(), RoleConstant.CLUB_OPERATOR.name()));
             List<Sys_user_role> clubList = dao().query(Sys_user_role.class, Cnd.where("roleId", "in", roleList).and("userId", "=", SecurityUtil.getUserId()).and("clubId", "is not", null));
             List<String> clubIdList = clubList.stream().map(Sys_user_role::getClubId).toList();
 
diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js b/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js
index 66108ec..ec833b9 100644
--- a/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js
+++ b/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js
@@ -91,10 +91,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
                         </el-form-item>
                         <el-form-item label="身份" prop="roleCode">
                             <el-radio-group v-model="formData.roleCode" size="medium">
-                                <el-radio v-if="!addMember" border label="CLUB_PRESIDENT">会长</el-radio>
-                                <el-radio v-if="!addMember" border label="CLUB_VICE_PRESIDENT">副会长</el-radio>
-                                <el-radio v-if="!addMember" border label="CLUB_SECRETARY">秘书长</el-radio>
-                                <el-radio v-if="!addMember" border label="CLUB_VICE_SECRETARY">副秘书长</el-radio>
+                                <el-radio v-if="!addMember" border label="CLUB_MANAGER">协会负责人</el-radio>
                                 <el-radio v-if="addMember" border label="CLUB_MEMBER">会员</el-radio>
                             </el-radio-group>
                         </el-form-item>
@@ -127,13 +124,10 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
                           </el-form-item>
                           <el-form-item prop="roleCode" label="身份">
                                 <el-checkbox-group v-model="roleCodeFormData.roleCode">
-                                  <el-checkbox label="CLUB_PRESIDENT">协会会长</el-checkbox>
-                                  <el-checkbox label="CLUB_VICE_PRESIDENT">协会副会长</el-checkbox>
-                                  <el-checkbox label="CLUB_SECRETARY">协会秘书长</el-checkbox>
-                                  <el-checkbox label="CLUB_VICE_SECRETARY">协会副秘书长</el-checkbox>
                                   <el-checkbox label="CLUB_OPERATOR">协会操作员</el-checkbox>
                                   <el-checkbox label="CLUB_REIMBURSEMENT_MANAGER">协会报销负责人</el-checkbox>
                                   <el-checkbox label="CLUB_MEMBER">协会会员</el-checkbox>
+                                  <el-checkbox label="CLUB_MANAGER">协会负责人</el-checkbox>
                                 </el-checkbox-group>
                           </el-form-item>
                     </el-form>
@@ -204,13 +198,6 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
         async userDoAdd() {
             const valid = await this.$refs.userForm.validate()
             if (!valid) return
-            if (this.formData.roleCode === "CLUB_PRESIDENT" || this.formData.roleCode === "CLUB_SECRETARY") {
-                const str = this.formData.roleCode === "CLUB_PRESIDENT" ? "会长" : "秘书长"
-                if (this.formData.users.length > 1) {
-                    this.$message.warning(str + "只能有一位")
-                    return
-                }
-            }
             const resp = await this.$axios.post("/platform/club/infoManage/manage/userDoAdd", {
                 clubId: this.parentNode.currentTreeData.id,
                 users: JSON.stringify(this.formData.users),
@@ -228,7 +215,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
         openUserAdd(flag) {
             this.userOptions = []
             this.addMember = flag
-            this.$set(this.formData, "roleCode", flag ? "CLUB_MEMBER" : "CLUB_PRESIDENT")
+            this.$set(this.formData, "roleCode", flag ? "CLUB_MEMBER" : "CLUB_MANAGER")
             this.$set(this.formData, "users", [])
             this.$set(this.formData, "payed", false)
             this.addDialogVisible = true
@@ -266,6 +253,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
         },
         updateRoleCode(row) {
             this.roleCodeFormData = clone(row)
+            this.roleCodeFormData.roleCode = (this.roleCodeFormData.roleCode || []).filter(code => code === "CLUB_MANAGER")
             this.roleCodeDialogVisible = true
         },
         onRoleCode() {