From 2956cb66222c0522f2a85158c93eae2d49e9228b Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 6 May 2026 15:47:01 +0800 Subject: [PATCH] commit --- .../apply/ClubUserJoinApplyController.java | 12 +++++++- .../apply/ClubUserJoinApprovalController.java | 2 +- .../apply/ClubUserJoinMineController.java | 2 +- .../club/service/ClubUserJoinService.java | 8 +++++ .../service/impl/ClubUserJoinServiceImpl.java | 30 +++++++++++++++++++ .../club/service/impl/SysClubServiceImpl.java | 9 +++++- .../club/infoManage/manage/clubInfoManage.js | 8 ++--- .../platform/zhgh/club/join/list/index.html | 2 ++ .../zhgh/club/register/mine/index.html | 2 +- 9 files changed, 66 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java index c412c035..3f15b467 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java @@ -68,7 +68,7 @@ public class ClubUserJoinApplyController { @Inject private ClubUserJoinService clubUserJoinService; - @At("/") + @At("") @SaCheckPermission("club.join.apply") @Ok("beetl:/platform/zhgh/club/join/apply/index.html") public void index() { @@ -128,6 +128,12 @@ public class ClubUserJoinApplyController { @SLog(tag = "社团管理系统-申请入/退会", msg = "申请社团入/退会") public Result submit(@Param("data") ClubUserApply clubUserApply, @Param("mode") Boolean mode) { + if (Boolean.TRUE.equals(mode)) { + String qualificationMsg = clubUserJoinService.checkJoinQualification(SecurityUtil.getUserId()); + if (StrUtil.isNotBlank(qualificationMsg)) { + return Result.error(99, qualificationMsg); + } + } if(mode == false) { clubUserApply = clubUserJoinService.buildExitApply(clubUserApply.getClubId(), SecurityUtil.getUserId()); if (ObjectUtil.isEmpty(clubUserApply)) { @@ -192,6 +198,10 @@ public class ClubUserJoinApplyController { @ApiOperation("校验是否申请过社团") @SaCheckPermission(value = {"club.join.apply", "h5.club.join.apply"}, mode = SaMode.OR) public Result checkApplyClub(@Valid String clubId) { + String qualificationMsg = clubUserJoinService.checkJoinQualification(SecurityUtil.getUserId()); + if (StrUtil.isNotBlank(qualificationMsg)) { + return Result.error(99, qualificationMsg); + } View_user user = dao.fetch(View_user.class, Cnd.where("id", "=", SecurityUtil.getUserId())); if (user.getMember() != 1) { return Result.error(99, "抱歉，您不满足入会的条件！"); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java index 7bb72a64..b99e6389 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApprovalController.java @@ -48,7 +48,7 @@ public class ClubUserJoinApprovalController { @Inject private ClubUserJoinService clubUserJoinService; - @At("/") + @At("") @SaCheckPermission("club.join.clubApproval") @Ok("beetl:/platform/zhgh/club/join/clubApproval/index.html") public void index() {} diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java index 92d611af..76a53a7e 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java @@ -45,7 +45,7 @@ public class ClubUserJoinMineController { @Inject private ClubUserJoinService clubUserJoinService; - @At("/") + @At("") @SaCheckPermission("club.join.mine") @Ok("beetl:/platform/zhgh/club/join/mine/index.html") public void index() {} diff --git a/src/main/java/com/budwk/app/zhgh/club/service/ClubUserJoinService.java b/src/main/java/com/budwk/app/zhgh/club/service/ClubUserJoinService.java index 1168e586..bf195fa3 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/ClubUserJoinService.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/ClubUserJoinService.java @@ -25,4 +25,12 @@ public interface ClubUserJoinService extends BaseService { * @return 入会时间 */ java.util.Date resolveJoinTime(String clubId, String userId); + + /** + * 校验当前用户是否满足申请加入社团的资格。 + * + * @param userId 用户ID + * @return 校验不通过时返回提示语，通过时返回null + */ + String checkJoinQualification(String userId); } diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/ClubUserJoinServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/ClubUserJoinServiceImpl.java index dc76f774..befd1811 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/ClubUserJoinServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/ClubUserJoinServiceImpl.java @@ -1,6 +1,9 @@ +package com.budwk.app.zhgh.club.service.impl; + import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.service.impl.BaseServiceImpl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.budwk.app.sys.views.View_user; import com.budwk.app.zhgh.club.model.ClubUser; import com.budwk.app.zhgh.club.model.ClubUserApply; @@ -15,10 +18,37 @@ import java.util.List; @IocBean(args = {"refer:dao"}) public class ClubUserJoinServiceImpl extends BaseServiceImpl implements ClubUserJoinService { + private static final List ALLOW_JOIN_PERSON_TYPES = List.of( + "教职工", + "未起薪人员", + "教职工新入会", + "教职工其他", + "劳动服务公司", + "后勤聘用人员", + "退休人员[一]", + "退休人员[二]", + "校聘劳务派遣全额" + ); + public ClubUserJoinServiceImpl(Dao dao) { super(dao); } + @Override + public String checkJoinQualification(String userId) { + View_user user = dao().fetch(View_user.class, Cnd.where("id", "=", userId)); + if (user == null) { + return "抱歉，您不满足入会的条件！"; + } + if (user.getMember() == null || user.getMember() != 1) { + return "抱歉，您不满足入会的条件！"; + } + if (StrUtil.isBlank(user.getPersonType()) || !ALLOW_JOIN_PERSON_TYPES.contains(user.getPersonType())) { + return "抱歉，您不满足入会的条件！"; + } + return null; + } + @Override public ClubUserApply buildExitApply(String clubId, String userId) { // 优先复用最近一次申请记录中的补充信息，避免用户重复填写基础资料。 diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java index 16a9faa1..846a0a8f 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubServiceImpl.java @@ -275,7 +275,14 @@ public class SysClubServiceImpl extends BaseServiceImpl implements SysC } cnd.andEX("year(info.createTime)", "=", pageForm.getYear()); cnd.and("info.userId", "=", SecurityUtil.getUserId()); - cnd.desc("createTime"); + // 我的注册列表默认按社团编码升序展示，点击表头时按用户选择的方向排序。 + if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { + cnd.asc("info.clubCode"); + } else if ("clubCode".equals(pageForm.getPageOrderName())) { + cnd.orderBy("info.clubCode", PageUtil.getOrder(pageForm.getPageOrderBy())); + } else { + cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } cnd.groupBy("info.id"); sql.setCondition(cnd); return listPageVO(pageForm, sql, ClubRegisterPageVo.class); 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 9ce01b83..fb6f4315 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 @@ -128,10 +128,10 @@ - 社团会长 - 社团副会长 - 社团秘书长 - 社团副秘书长 + 社团会长 + 社团副会长 + 社团秘书长 + 社团副秘书长 社团操作员 社团报销负责人 社团会员 diff --git a/src/main/resources/views/platform/zhgh/club/join/list/index.html b/src/main/resources/views/platform/zhgh/club/join/list/index.html index 06874fe1..28f1fbf5 100644 --- a/src/main/resources/views/platform/zhgh/club/join/list/index.html +++ b/src/main/resources/views/platform/zhgh/club/join/list/index.html @@ -136,6 +136,8 @@ layout("/layouts/platform.html"){ this.$axios.post("/platform/club/join/apply/checkApplyClub", { clubId: row.id }).then((res) => { if (res.code === 0) { commonUtil.pjaxPush('/platform/club/join/apply?clubId=' + row.id) + } else { + this.$message.warning(res.msg) } }) }, diff --git a/src/main/resources/views/platform/zhgh/club/register/mine/index.html b/src/main/resources/views/platform/zhgh/club/register/mine/index.html index 9adb7bab..24016426 100644 --- a/src/main/resources/views/platform/zhgh/club/register/mine/index.html +++ b/src/main/resources/views/platform/zhgh/club/register/mine/index.html @@ -32,7 +32,7 @@ layout("/layouts/platform.html"){ - +