diff --git a/src/main/java/com/budwk/app/flow/handler/FlowClubPresidentByArgsAssignmentHandler.java b/src/main/java/com/budwk/app/flow/handler/FlowClubPresidentByArgsAssignmentHandler.java index 67b3983..052bf80 100644 --- a/src/main/java/com/budwk/app/flow/handler/FlowClubPresidentByArgsAssignmentHandler.java +++ b/src/main/java/com/budwk/app/flow/handler/FlowClubPresidentByArgsAssignmentHandler.java @@ -34,7 +34,7 @@ public class FlowClubPresidentByArgsAssignmentHandler implements AssignmentHandl } CommonService commonService = ServiceContext.find(CommonService.class); - List users = commonService.findUserInfoByRoleCode(Sys_user_role::getClubId, clubId, RoleConstant.CLUB_PRESIDENT); + List users = commonService.findUserInfoByRoleCode(Sys_user_role::getClubId, clubId, RoleConstant.CLUB_MANAGER); if(Lang.isEmpty(users)) { throw new BaseException("未查询到相关审批人"); @@ -45,7 +45,7 @@ public class FlowClubPresidentByArgsAssignmentHandler implements AssignmentHandl @Override public String getMessage() { - return "获取协会会长(根据args中的clubId)"; + return "获取协会负责人(根据args中的clubId)"; } @Override diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java index 697ad5a..6b15469 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java @@ -206,7 +206,7 @@ public class ActivityBasicScopeController { if (!StpUtil.hasRole(RoleConstant.SYSADMIN.name()) && !StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) { SqlExpressionGroup group = new SqlExpressionGroup(); group.or("creator", "=", SecurityUtil.getUserId()); - if(AuthUtil.hasRole(RoleConstant.CLUB_PRESIDENT.name())) { + if(AuthUtil.hasRole(RoleConstant.CLUB_MANAGER.name())) { group.or("groupName", "like", "%社%"); } cnd.and(group); @@ -250,7 +250,7 @@ public class ActivityBasicScopeController { 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_CLUB_MANAGER", StpUtil.hasRole(RoleConstant.CLUB_MANAGER.name())); addv("is_sysadmin", StpUtil.hasRole(RoleConstant.SYSADMIN.name())); addv("unionid", SecurityUtil.getUnionId()); }}); @@ -385,7 +385,7 @@ public class ActivityBasicScopeController { if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())){ boolean isBranchUnionChairman = AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name()); - boolean isClubPresident = AuthUtil.hasRole(RoleConstant.CLUB_PRESIDENT.name()); + boolean isClubPresident = AuthUtil.hasRole(RoleConstant.CLUB_MANAGER.name()); List manageClubIdList = sysClubService.getMyManageClub().stream().map(SysClub::getId).toList(); if (isBranchUnionChairman && isClubPresident) { // Users with both roles can search their union users and their managed club members. @@ -396,7 +396,7 @@ public class ActivityBasicScopeController { } cnd.and(scopeGroup); } else if (isClubPresident) { - // Club presidents can only search members from clubs they manage. + // Club managers can only search members from clubs they manage. cnd.and("clubuser.clubid", "in", Lang.isNotEmpty(manageClubIdList) ? manageClubIdList : List.of("__EMPTY_CLUB_ID__")); } else { cnd.andEX("u.unionid", "=", SecurityUtil.getUnionId()); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java index 8d59a9e..10cfae0 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java @@ -131,7 +131,7 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { group.or("tissue.unionId", "=", SecurityUtil.getUnionId()); } - if (AuthUtil.hasRole(RoleConstant.CLUB_PRESIDENT.name())) { + if (AuthUtil.hasRole(RoleConstant.CLUB_MANAGER.name())) { List myManageClub = sysClubService.getMyManageClub(); List clubIds = myManageClub.stream().map(SysClub::getId).collect(Collectors.toList()); group.or("tissue.clubId", "in", clubIds); diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java index 2706481..ae3b892 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/vo/CommonPageParam.java @@ -57,7 +57,7 @@ public class CommonPageParam extends PageForm { RoleConstant.BRANCH_UNION_OPERATOR.name())) { group.or(prefix + "unionid", "=", SecurityUtil.getUnionId()); } - if (AuthUtil.hasRoleOr(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_PRESIDENT.name())) { + if (AuthUtil.hasRoleOr(RoleConstant.CLUB_MANAGER.name())) { // cnd.and(prefix + "clubId", "=", ); group.or(prefix + "clubId", "in", SecurityUtil.getClubIds()); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/planSummary/controller/YearPlanController.java b/src/main/java/com/budwk/app/zhgh/activity/planSummary/controller/YearPlanController.java index a746a66..aa16a4b 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/planSummary/controller/YearPlanController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/planSummary/controller/YearPlanController.java @@ -145,7 +145,7 @@ public class YearPlanController { @SaCheckPermission("planSummary.yearPlan.manage") public Result queryClub() { Cnd cnd = Cnd.NEW(); - if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && AuthUtil.hasRole(RoleConstant.CLUB_PRESIDENT.name())) { + if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name()) && AuthUtil.hasRole(RoleConstant.CLUB_MANAGER.name())) { List clubList = sysClubService.getMyManageClub(); List list = clubList.stream().map(SysClub::getId).toList(); cnd.and(SysClub::getId, "in", list); diff --git a/src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearPlanServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearPlanServiceImpl.java index c7f6ea1..7d986b4 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearPlanServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearPlanServiceImpl.java @@ -71,7 +71,7 @@ public class YearPlanServiceImpl extends BaseServiceImpl implements Ye if(AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { group.or("yp.tissueId", "=", SecurityUtil.getUnionId()); } - if(AuthUtil.hasRole(RoleConstant.CLUB_PRESIDENT.name())) { + if(AuthUtil.hasRole(RoleConstant.CLUB_MANAGER.name())) { List clubList = sysClubService.getMyManageClub(); List list = clubList.stream().map(SysClub::getId).toList(); group.or("yp.tissueId", "in", list); diff --git a/src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearSummaryServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearSummaryServiceImpl.java index d8cc8b3..edf5aa3 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearSummaryServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/planSummary/service/impl/YearSummaryServiceImpl.java @@ -68,7 +68,7 @@ public class YearSummaryServiceImpl extends BaseServiceImpl impleme if(AuthUtil.hasRole(RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { group.or("ys.tissueId", "=", SecurityUtil.getUnionId()); } - if(AuthUtil.hasRole(RoleConstant.CLUB_PRESIDENT.name())) { + if(AuthUtil.hasRole(RoleConstant.CLUB_MANAGER.name())) { List clubList = sysClubService.getMyManageClub(); List list = clubList.stream().map(SysClub::getId).toList(); group.or("ys.tissueId", "in", list); diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java index 1c2a9d5..9366fb0 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/statistics/TrainSignUpActivityStatisticsController.java @@ -132,7 +132,7 @@ public class TrainSignUpActivityStatisticsController { result.add(activity); } } - if(AuthUtil.hasRoleOr(RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_OPERATOR.name())) { + if(AuthUtil.hasRoleOr(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_OPERATOR.name())) { if(clubIds.stream().anyMatch(activity.getHostUnits()::contains) || clubIds.stream().anyMatch(activity.getHelpUnits()::contains)) { result.add(activity); } diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java index 353c824..04c6b1d 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java @@ -63,7 +63,7 @@ public class ClubUserMineClubController { FROM sys_club club LEFT JOIN club_user uc ON club.id = uc.clubId - LEFT JOIN club_user presidentCu ON presidentCu.clubId = club.id AND JSON_CONTAINS(presidentCu.roleCode, '"CLUB_PRESIDENT"') + LEFT JOIN club_user presidentCu ON presidentCu.clubId = club.id AND JSON_CONTAINS(presidentCu.roleCode, '"CLUB_MANAGER"') LEFT JOIN sys_user presidentUser ON presidentUser.id = presidentCu.userId LEFT JOIN club_user secretaryCu ON secretaryCu.clubId = club.id AND JSON_CONTAINS(secretaryCu.roleCode, '"CLUB_SECRETARY"') LEFT JOIN sys_user secretaryUser ON secretaryUser.id = secretaryCu.userId diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/common/ClubCommonController.java b/src/main/java/com/budwk/app/zhgh/club/controller/common/ClubCommonController.java index 49360af..5d3ea85 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/common/ClubCommonController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/common/ClubCommonController.java @@ -62,7 +62,7 @@ public class ClubCommonController { public Result listClubByRole() { Cnd cnd = Cnd.NEW(); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { - Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT); + Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_MANAGER); List userRoles = sysClubService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId())); List myClubId = userRoles.stream().map(Sys_user_role::getClubId).toList(); cnd.and("c.id", "in", myClubId); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateClubAuditController.java b/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateClubAuditController.java index d1bda7f..08ff3bd 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateClubAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/evaluate/ClubEvaluateClubAuditController.java @@ -63,7 +63,7 @@ public class ClubEvaluateClubAuditController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.evaluate.clubAudit") - @SLog(tag = "协会管理系统-协会评优", msg = "会长审核评优申请") + @SLog(tag = "协会管理系统-协会评优", msg = "协会负责人审核评优申请") public Result approval(@Valid @Param("approval") BpmTaskApprovalParam approvalParam) { approvalParam.getBpmTaskApprovalTypeEnum(); Map variables = BeanUtil.beanToMap(approvalParam); @@ -80,7 +80,7 @@ public class ClubEvaluateClubAuditController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.evaluate.clubAudit") - @SLog(tag = "协会管理系统-协会评优", msg = "会长撤回评优申请") + @SLog(tag = "协会管理系统-协会评优", msg = "协会负责人撤回评优申请") public Result revoke(@Valid String taskId) { bpmService.revokeTask(taskId); return Result.success(); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineClubAuditController.java b/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineClubAuditController.java index eb4cf57..b1998b2 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineClubAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/examine/ClubExamineClubAuditController.java @@ -57,7 +57,7 @@ public class ClubExamineClubAuditController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.examine.clubAudit") - @SLog(tag = "协会管理系统-协会年审", msg = "会长审核年度考核") + @SLog(tag = "协会管理系统-协会年审", msg = "协会负责人审核年度考核") public Result approval(@Valid @Param("approval") BpmTaskApprovalParam approvalParam) { approvalParam.getBpmTaskApprovalTypeEnum(); Map variables = BeanUtil.beanToMap(approvalParam); @@ -74,7 +74,7 @@ public class ClubExamineClubAuditController { @At @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("club.examine.clubAudit") - @SLog(tag = "协会管理系统-协会年审", msg = "会长撤回年度考核") + @SLog(tag = "协会管理系统-协会年审", msg = "协会负责人撤回年度考核") public Result revoke(@Valid String taskId) { bpmService.revokeTask(taskId); return Result.success(); 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 7688297..bac633c 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 @@ -196,12 +196,12 @@ public class ClubInfoManageController { @SLog(tag = "协会管理系统-信息管理", msg = "修改身份") public Result updateRoleCode(@Param("id") String id, @Valid String[] roleCodes, @Valid String clubId) { List roleCodeList = Arrays.asList(roleCodes); - //查询社团是否存在会长或者秘书长 - if(Arrays.asList(roleCodes).contains(RoleConstant.CLUB_PRESIDENT.name())) { + //查询社团是否存在协会负责人或者秘书长 + if(Arrays.asList(roleCodes).contains(RoleConstant.CLUB_MANAGER.name())) { int count = dao.count(ClubUser.class, Cnd.where("clubId", "=", clubId) - .and(new Static("JSON_CONTAINS(roleCode, '\"%s\"')".formatted(RoleConstant.CLUB_PRESIDENT.name())))); + .and(new Static("JSON_CONTAINS(roleCode, '\"%s\"')".formatted(RoleConstant.CLUB_MANAGER.name())))); if (count > 0) { -// return Result.error("会长只能有一位"); +// return Result.error("协会负责人只能有一位"); } } if(Arrays.asList(roleCodes).contains(RoleConstant.CLUB_SECRETARY.name())) { @@ -272,12 +272,12 @@ public class ClubInfoManageController { @SLog(tag = "协会管理系统-信息管理", msg = "添加协会成员") public Result userDoAdd(@Valid String clubId, @Valid String[] users, @Valid String roleCode, @Valid Boolean payed) { - //查询社团是否存在会长或者秘书长 - if (List.of(RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name()).contains(roleCode)) { + //查询社团是否存在协会负责人或者秘书长 + if (List.of(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_SECRETARY.name()).contains(roleCode)) { int count = clubInfoManageService.dao().count(ClubUser.class, Cnd.where("clubId", "=", clubId) .and(new Static("JSON_CONTAINS(roleCode, '\"%s\"')".formatted(roleCode)))); if (count > 0) { - return Result.error((Objects.equals(roleCode, RoleConstant.CLUB_PRESIDENT.name()) ? "会长" : "秘书长") + "只能有一位"); + return Result.error((Objects.equals(roleCode, RoleConstant.CLUB_MANAGER.name()) ? "协会负责人" : "秘书长") + "只能有一位"); } } Sys_role sysRole = sysRoleService.getByCode(roleCode); @@ -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_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)) { + if (List.of(RoleConstant.CLUB_MANAGER.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/controller/statistics/ClubStatisticsController.java b/src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java index 58cec93..7ce6d6a 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java @@ -98,7 +98,7 @@ public class ClubStatisticsController { cnd.and("id", auditState ? "in" : "not in", registers.stream().map(SysClubExamineRegister::getClubId).toList()); }*/ if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SCHOOL_UNION_CLUB_ADMIN.name())) { - Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT); + Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_MANAGER); List userRoles = sysClubService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId())); List myClubId = userRoles.stream().map(Sys_user_role::getClubId).toList(); cnd.and("id", "in", myClubId); @@ -136,7 +136,7 @@ public class ClubStatisticsController { $condition ORDER BY CASE - WHEN JSON_CONTAINS(c.roleCode, '"CLUB_PRESIDENT"') THEN 1 + WHEN JSON_CONTAINS(c.roleCode, '"CLUB_MANAGER"') THEN 1 WHEN JSON_CONTAINS(c.roleCode, '"CLUB_VICE_PRESIDENT"') THEN 2 WHEN JSON_CONTAINS(c.roleCode, '"CLUB_SECRETARY"') THEN 3 WHEN JSON_CONTAINS(c.roleCode, '"CLUB_VICE_SECRETARY"') THEN 4 @@ -186,7 +186,7 @@ public class ClubStatisticsController { $condition ORDER BY CASE - WHEN JSON_CONTAINS(c.roleCode, '"CLUB_PRESIDENT"') THEN 1 + WHEN JSON_CONTAINS(c.roleCode, '"CLUB_MANAGER"') THEN 1 WHEN JSON_CONTAINS(c.roleCode, '"CLUB_VICE_PRESIDENT"') THEN 2 WHEN JSON_CONTAINS(c.roleCode, '"CLUB_SECRETARY"') THEN 3 WHEN JSON_CONTAINS(c.roleCode, '"CLUB_VICE_SECRETARY"') THEN 4 @@ -196,7 +196,7 @@ public class ClubStatisticsController { """); Cnd cnd = Cnd.NEW(); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SCHOOL_UNION_CLUB_ADMIN.name())) { - Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT); + Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_MANAGER); List userRoles = sysClubService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId())); List myClubId = userRoles.stream().map(Sys_user_role::getClubId).toList(); cnd.and("c.clubId", "in", myClubId); @@ -371,7 +371,7 @@ public class ClubStatisticsController { sum( CASE WHEN su.userState in ('退休') $myCondition THEN 1 ELSE 0 END ) AS retire, sum( CASE WHEN su.sex like '%男%' $myCondition THEN 1 ELSE 0 END ) AS man, sum( CASE WHEN su.sex like '%女%' $myCondition THEN 1 ELSE 0 END ) AS woman, - sum( CASE WHEN ('CLUB_PRESIDENT' MEMBER OF (cu.roleCode) or 'CLUB_VICE_PRESIDENT' MEMBER OF (cu.roleCode) or 'CLUB_SECRETARY' MEMBER OF (cu.roleCode) or 'CLUB_VICE_SECRETARY' MEMBER OF (cu.roleCode)) AND 1 = 1 $myCondition THEN 1 ELSE 0 END ) AS governing_body + sum( CASE WHEN ('CLUB_MANAGER' MEMBER OF (cu.roleCode) or 'CLUB_VICE_PRESIDENT' MEMBER OF (cu.roleCode) or 'CLUB_SECRETARY' MEMBER OF (cu.roleCode) or 'CLUB_VICE_SECRETARY' MEMBER OF (cu.roleCode)) AND 1 = 1 $myCondition THEN 1 ELSE 0 END ) AS governing_body FROM sys_club club LEFT JOIN club_user cu ON cu.clubId = club.id @@ -389,7 +389,7 @@ public class ClubStatisticsController { cnd.and("club.id", auditState ? "in" : "not in", businessNoList); } if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SCHOOL_UNION_CLUB_ADMIN.name())) { - Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT); + Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_MANAGER); List userRoles = sysClubService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId())); List myClubId = userRoles.stream().map(Sys_user_role::getClubId).toList(); cnd.and("club.id", "in", myClubId); diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java index 5092608..fc6eb2c 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java @@ -108,7 +108,7 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl clubIdList = clubList.stream().map(Sys_user_role::getClubId).toList(); @@ -167,7 +167,7 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl implements SysC SELECT club.*, u.username as concatPersonName, - (select GROUP_CONCAT(username) from sys_user where id in (select userId from club_user u where u.clubId=club.id and JSON_CONTAINS(u.roleCode, '"CLUB_PRESIDENT"'))) as clubLeader, + (select GROUP_CONCAT(username) from sys_user where id in (select userId from club_user u where u.clubId=club.id and JSON_CONTAINS(u.roleCode, '"CLUB_MANAGER"'))) as clubLeader, (select GROUP_CONCAT(username) from sys_user where id in (select userId from club_user u where u.clubId=club.id and JSON_CONTAINS(u.roleCode, '"CLUB_SECRETARY"'))) as clubSecretary, (SELECT count( DISTINCT scu.userId ) FROM club_user scu WHERE scu.clubId = club.id ) currentPeopleNum FROM @@ -116,7 +116,7 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC // 校工会主席在协会管理界面按校级管理角色查看全部协会。 if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SCHOOL_UNION_CLUB_ADMIN.name(), RoleConstant.SCHOOL_UNION_CHAIRMAN.name())) { - List 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 roleList = commonService.findUserRoleByRoleCode(List.of(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_VICE_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name(), RoleConstant.CLUB_VICE_SECRETARY.name(),RoleConstant.CLUB_OPERATOR.name())); List clubList = dao().query(Sys_user_role.class, Cnd.where("roleId", "in", roleList).and("userId", "=", SecurityUtil.getUserId()).and("clubId", "is not", null)); List clubIdList = clubList.stream().map(Sys_user_role::getClubId).toList(); @@ -150,7 +150,7 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC cnd.and("instance.state", "=", ProcessInstanceStateEnum.FINISHED.getCode()); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SCHOOL_UNION_CLUB_ADMIN.name())) { cnd.and("ur.userId", "=", SecurityUtil.getUserId()); - List 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 roleList = commonService.findUserRoleByRoleCode(List.of(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_VICE_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name(), RoleConstant.CLUB_VICE_SECRETARY.name(), RoleConstant.CLUB_OPERATOR.name())); cnd.and("ur.roleId", "in", roleList); } cnd.and("ex.year", "=", year); diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubUserServiceImpl.java index bc54c63..e7ff329 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubUserServiceImpl.java @@ -73,7 +73,7 @@ public class SysClubUserServiceImpl extends BaseServiceImpl implements WHERE scu.clubId = @clubId ORDER BY CASE - WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_PRESIDENT"') THEN 1 + WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_MANAGER"') THEN 1 WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_VICE_PRESIDENT"') THEN 2 WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_SECRETARY"') THEN 3 WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_VICE_SECRETARY"') THEN 4 @@ -128,7 +128,7 @@ public class SysClubUserServiceImpl extends BaseServiceImpl implements @Override public String getClubLeader(String clubId) { - List userList = commonService.findUserInfoByRoleCode("clubId", clubId, RoleConstant.CLUB_PRESIDENT.name()); + List userList = commonService.findUserInfoByRoleCode("clubId", clubId, RoleConstant.CLUB_MANAGER.name()); return userList.stream().map(Sys_user::getLoginname).collect(Collectors.joining(",")); } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleFirstExamineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleFirstExamineController.java index e1e9b68..9faa453 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleFirstExamineController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleFirstExamineController.java @@ -138,7 +138,7 @@ public class ArticleFirstExamineController { } assignments.add(branchUnionApprovalLoginName); } else if (result.equals("BACK_TO_CLUB")) { - String branchClubApprovalLoginName = commonService.findUserLoginNameByRoleCode(RoleConstant.CLUB_PRESIDENT, Cnd.where(Sys_user_role::getClubId, "=", article.getClubId())); + String branchClubApprovalLoginName = commonService.findUserLoginNameByRoleCode(RoleConstant.CLUB_MANAGER, Cnd.where(Sys_user_role::getClubId, "=", article.getClubId())); if (StrUtil.isBlank(branchClubApprovalLoginName)) { return Result.error("协会未配置审批人,请联系协会!"); } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java index d7fe10d..d62732a 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyController.java @@ -157,7 +157,7 @@ public class ActivityBudgetApplyController { public Result listClub(){ Cnd cnd = Cnd.NEW(); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { - Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT); + Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_MANAGER); List userRoles = sysClubService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId())); List myClubId = userRoles.stream().map(Sys_user_role::getClubId).toList(); cnd.and("id", "in", myClubId); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java index 58dd380..04e4c4f 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/service/impl/ActivityBudgetServiceImpl.java @@ -99,7 +99,7 @@ public class ActivityBudgetServiceImpl extends BaseServiceImpl i group1.and("info.unionId", "=", SecurityUtil.getUnionId()); group.or(group1); } - if (AuthUtil.hasRoleOr(RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name())) { + if (AuthUtil.hasRoleOr(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_SECRETARY.name())) { List myManageClub = sysClubService.getMyManageClub(); List clubIds = myManageClub.stream().map(SysClub::getId).toList(); SqlExpressionGroup group1 = new SqlExpressionGroup(); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java index 47f0755..d720f66 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubController.java @@ -66,7 +66,7 @@ public class OutlayManageClubController { """); cnd.andEX("year", "=", year); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { - Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT); + Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_MANAGER); List userRoles = baseService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId())); List myClubId = userRoles.stream().map(Sys_user_role::getClubId).toList(); cnd.andEX("clubId", "in", myClubId); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java index 9a8197d..b0b5464 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayManage/club/controller/OutlayManageClubUseDetailController.java @@ -74,7 +74,7 @@ public class OutlayManageClubUseDetailController { if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { cnd.andEX("clubId", "=", clubId); } else { - Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT); + Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_MANAGER); List userRoles = baseService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId())); List myClubId = userRoles.stream().map(Sys_user_role::getClubId).toList(); cnd.andEX("clubId", "in", myClubId); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java index 0b5524f..b366bd4 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseApplyServiceImpl.java @@ -123,7 +123,7 @@ public class OutlayReimburseApplyServiceImpl extends BaseServiceImpl userRoles = dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId())); List myClubId = userRoles.stream().map(Sys_user_role::getClubId).toList(); diff --git a/src/main/resources/static/components/module/activity/UserScope.vue b/src/main/resources/static/components/module/activity/UserScope.vue index 50e25fb..c85af5c 100644 --- a/src/main/resources/static/components/module/activity/UserScope.vue +++ b/src/main/resources/static/components/module/activity/UserScope.vue @@ -228,12 +228,12 @@ + v-if="is_A06===true||is_sysadmin===true||is_H02===true||is_CLUB_MANAGER===true"> 协会: { if (["CLUB"].includes(v.name)) { activityDeclareReimbursementList.push(v) diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html index 1d834e9..c3ba84e 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/mine/index.html @@ -40,7 +40,7 @@ layout("/layouts/platform.html"){ -