From 6795c475dfb55ef390590ee099fa462b21fad36a Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Mon, 13 Jan 2025 10:59:21 +0800 Subject: [PATCH] commit --- .../platform/sys/club/SysClubUserCon.java | 8 ++++-- .../club/applyIn/ClubApplyInController.java | 25 +++++++++++++++++-- .../views/mobile/club/clubAudit.html | 8 ++++-- .../resources/views/mobile/club/inClub.html | 22 ++++++++++++---- .../platform/sys/club/applyIn/schoolsh.html | 4 +-- .../views/platform/sys/club/applyIn/shrt.html | 6 ++++- .../views/platform/sys/club/applyIn/sqrt.html | 8 ++++-- .../platform/sys/club/clubUserCount.html | 4 +-- .../sys/club/manage/clubInfoManage.html | 8 +++--- .../views/platform/sys/club/users.html | 12 ++++----- 10 files changed, 77 insertions(+), 28 deletions(-) diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java index 1d150b1..847cdcd 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/SysClubUserCon.java @@ -241,10 +241,14 @@ public class SysClubUserCon { //暂时屏蔽了校工会审核 //int status = ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") ? 5 : 3; int status = 0; - if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") || sf == 2) { + if(sf == 2) { status = 5; } else { - status = 3; + if(ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { + status = 5; + } else { + status = 3; + } } //查询校协会管理员 diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java index 29bdf1a..4e5ca8a 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyInController.java @@ -15,6 +15,7 @@ import io.v.nutz.sys.constant.club.ClubRegistAuditState; import io.v.nutz.sys.controllers.platform.sys.handler.ClubUserApplyToDoHandler; import io.v.nutz.sys.models.Sys_club; import io.v.nutz.sys.models.Sys_club_user; +import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.services.SysClubService; import io.v.nutz.sys.services.SysClubUserService; import io.v.nutz.web.commons.utils.ShiroUtil; @@ -139,16 +140,36 @@ public class ClubApplyInController { return sysClubService.listPage(pageNumber, pageSize, sql); } + @At + @ViReturn + @RequiresPermissions("sys.club.sq") + @Aop(TransAop.READ_COMMITTED) + public Object validApply() { + //查询是否是会员 + Sys_user sysUser = dao.fetch(Sys_user.class, ShiroUtil.getUserId()); + if(sysUser.getMember() != 1) { + return Result.error("您当前不是会员，无法申请"); + } + int count = dao.count(Sys_club_user.class, Cnd.where("userid", "=", ShiroUtil.getUserId()).and("isNormal", "=", true)); + if(count >= 3) { + return Result.error("您已参与3个协会，无法申请"); + } + return Result.success(); + } @At @ViReturn @RequiresPermissions("sys.club.sq") @Aop(TransAop.READ_COMMITTED) public Object submit(Sys_club_user sys_club_user) { + Sys_club sysClub = dao.fetch(Sys_club.class, sys_club_user.getClubid()); Sys_club_user sysClubUser = dao.fetch(Sys_club_user.class, Cnd.where("clubid", "=", sys_club_user.getClubid()).and("userid", "=", ShiroUtil.getUserId())); - sys_club_user.setInvite(sysClubUser.getInvite()); - + if(sysClubUser == null) { + sys_club_user.setInvite(false); + } else { + sys_club_user.setInvite(sysClubUser.getInvite()); + } sysClubUserService.clear(Cnd.where("clubid", "=", sys_club_user.getClubid()).and("userid", "=", ShiroUtil.getPrincipalProperty("id"))); boolean isInvite = sys_club_user.getInvite() && Objects.equals(sysClub.getState(), ClubRegistAuditState.NOT_SUBMIT); diff --git a/src/main/resources/views/mobile/club/clubAudit.html b/src/main/resources/views/mobile/club/clubAudit.html index 8720c98..c7a5bf3 100644 --- a/src/main/resources/views/mobile/club/clubAudit.html +++ b/src/main/resources/views/mobile/club/clubAudit.html @@ -133,7 +133,7 @@ layout("/mobile/platform.html"){
@@ -369,7 +369,11 @@ layout("/mobile/platform.html"){ this.userTypeOptions.push({text: item.name, value: item.code}) }) this.userTypeOptions.unshift({text: '人员类型'}) - this.onLoad() + } + }) + window.addEventListener('pageshow', e => { + if (e.persisted || (window.performance && window.performance.navigation.type === 2)) { + vue.onLoad() } }) diff --git a/src/main/resources/views/mobile/club/inClub.html b/src/main/resources/views/mobile/club/inClub.html index 47f5c07..f45c1e8 100644 --- a/src/main/resources/views/mobile/club/inClub.html +++ b/src/main/resources/views/mobile/club/inClub.html @@ -174,7 +174,7 @@ layout("/mobile/platform.html"){
@@ -457,7 +457,10 @@ layout("/mobile/platform.html"){ provideServicesVisible: false, playRoleVisible: false, selfSkillVisible: false, - familyRelationVisible: false + familyRelationVisible: false, + pageForm: { + isjr: false + } } }, methods: { @@ -513,9 +516,14 @@ layout("/mobile/platform.html"){ this.loading = false }) }, - openInfo(row, type) { + async openInfo(row, type) { this.viewType = type - if(type === 'join') { + if (type === 'join') { + const resp = await $.post("/platform/sys/club/sq/validApply") + if (resp.code !== 0) { + vant.Toast(resp.msg) + return + } this.formData = { username: "${@shiro.getPrincipalProperty('username')}", loginname: "${@shiro.getPrincipalProperty('loginname')}", @@ -589,7 +597,11 @@ layout("/mobile/platform.html"){ this.$set(this.pageForm, "clubType", this.typeOptions[0].value) this.$set(this.pageForm, "isjr", this.clubType[0].value) this.pageForm.searchName = 'club.name' - this.onLoad() + } + }) + window.addEventListener('pageshow', e => { + if (e.persisted || (window.performance && window.performance.navigation.type === 2)) { + vue.onLoad() } }) diff --git a/src/main/resources/views/platform/sys/club/applyIn/schoolsh.html b/src/main/resources/views/platform/sys/club/applyIn/schoolsh.html index 7243be3..ae40b70 100644 --- a/src/main/resources/views/platform/sys/club/applyIn/schoolsh.html +++ b/src/main/resources/views/platform/sys/club/applyIn/schoolsh.html @@ -158,13 +158,13 @@ layout("/layouts/platform.html"){ {{ formatAuditTime(scope.row) }} --> - - + -->