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 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 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 = { - 会长 - 副会长 - 秘书长 - 副秘书长 + 协会负责人 会员 @@ -127,13 +124,10 @@ const CLUB_INFO_MANAGE_TEMPLATE = { - 协会会长 - 协会副会长 - 协会秘书长 - 协会副秘书长 协会操作员 协会报销负责人 协会会员 + 协会负责人 @@ -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() {