diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java index 40e78f1..576f2d2 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java @@ -123,7 +123,7 @@ public class TrainSignUpActivity extends BaseModel implements Serializable, SysH sysHomeActivity.setName(this.getActivityName()); sysHomeActivity.setCover(this.getCover()); sysHomeActivity.setUrl("/platform/trainSingUp/manage/apply"); - sysHomeActivity.setH5Url("/platform/mobile/trainSignUpActivity/trainList"); + sysHomeActivity.setH5Url("/platform/mobile/trainSignUpActivity/activityInfo?activityId=" + this.getId() + "&endTime=" + this.getActivitySignUpEndTime() + "&isMySign=0"); if (Lang.isNotEmpty(this.getActivitySignUpStartTime())) { sysHomeActivity.setStartDate(this.getActivitySignUpStartTime()); sysHomeActivity.setEndDate(this.getActivitySignUpEndTime()); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubChangeManagerController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubChangeManagerController.java index 0f0495b..fca0a19 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubChangeManagerController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubChangeManagerController.java @@ -18,10 +18,7 @@ import com.budwk.app.sys.models.Sys_user; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.web.controllers.open.commons.service.CommonService; -import com.budwk.app.zhgh.club.model.ClubUser; -import com.budwk.app.zhgh.club.model.SysClub; -import com.budwk.app.zhgh.club.model.SysClubManager; -import com.budwk.app.zhgh.club.model.SysClubRule; +import com.budwk.app.zhgh.club.model.*; import com.budwk.app.zhgh.club.param.ClubUserPageForm; import com.budwk.app.zhgh.club.service.SysClubInfoManageService; import com.budwk.app.zhgh.club.service.impl.SysClubUserServiceImpl; @@ -134,7 +131,11 @@ public class ClubChangeManagerController { @SLog(tag = "协会管理系统-信息管理", msg = "提交变更理事机构") public Object submit(@Param("data") SysClubManager clubManager) { - List list = dao.query(SysClubManager.class, Cnd.NEW()); + Cnd cnd = Cnd.NEW(); + if(StrUtil.isNotBlank(clubManager.getId())) { + cnd.and(SysClubManager::getId, "!=", clubManager.getId()); + } + List list = dao.query(SysClubManager.class, cnd); List idList = list.stream().map(SysClubManager::getId).toList(); int count = dao.count(BpmProcessInstance.class, Cnd.where(BpmProcessInstance::getProcessInstanceBusinessId, "in", idList).and(BpmProcessInstance::getProcessInstanceStatus, "!=", BpmProcessInstanceStatusEnum.COMPLETED)); if (count > 0) { 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 9a5098e..aa22680 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 @@ -188,7 +188,8 @@ public class ClubInfoManageController { RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_VICE_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name(), - RoleConstant.CLUB_VICE_SECRETARY.name() + RoleConstant.CLUB_VICE_SECRETARY.name(), + RoleConstant.CLUB_OPERATOR.name() )); //如果变更为会员,则直接变更 @@ -310,7 +311,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()).contains(roleCode)) { + 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)) { roleCodeList.remove(RoleConstant.CLUB_MEMBER.name()); } if(!roleCodeList.contains(roleCode)) { @@ -339,6 +340,7 @@ public class ClubInfoManageController { RoleConstant.CLUB_VICE_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name(), RoleConstant.CLUB_VICE_SECRETARY.name(), + RoleConstant.CLUB_OPERATOR.name(), RoleConstant.CLUB_MEMBER.name()); for (String code : roleCodes) { String roleId = sysRoleService.getByCode(code).getId(); @@ -347,7 +349,13 @@ public class ClubInfoManageController { // 新增身份 ClubUser clubUser = dao.fetch(ClubUser.class, Cnd.where(ClubUser::getClubId, "=", clubId).and(ClubUser::getUserId, "=", userId)); - clubUser.setRoleCode(Arrays.asList(roleCode)); + List list = new ArrayList<>(Arrays.asList(roleCode)); + if(list.isEmpty()) { + list.add(RoleConstant.CLUB_MEMBER.name()); + } else { + list.remove(RoleConstant.CLUB_MEMBER.name()); + } + clubUser.setRoleCode(list); dao.update(clubUser,"roleCode"); // 新增权限 diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java index 5a8ffd9..7b363c8 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java @@ -123,7 +123,11 @@ public class ClubRefreshReportController { @SLog(tag = "协会管理系统-提交换届报告", msg = "提交换届报告") public Object submit(@Param("data") SysClubRefresh refresh) { - List list = dao.query(SysClubRefresh.class, Cnd.NEW()); + Cnd cnd = Cnd.NEW(); + if(StrUtil.isNotBlank(refresh.getId())) { + cnd.and(SysClubRefresh::getId, "!=", refresh.getId()); + } + List list = dao.query(SysClubRefresh.class, cnd); List idList = list.stream().map(SysClubRefresh::getId).toList(); int count = dao.count(BpmProcessInstance.class, Cnd.where(BpmProcessInstance::getProcessInstanceBusinessId, "in", idList).and(BpmProcessInstance::getProcessInstanceStatus, "!=", BpmProcessInstanceStatusEnum.COMPLETED)); if (count > 0) { diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java index 0d945aa..a059057 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java @@ -123,7 +123,11 @@ public class ClubRuleUpdateController { @SLog(tag = "协会管理系统-信息管理", msg = "提交章程备案") public Object submit(@Param("data")SysClubRule clubRule) { - List list = dao.query(SysClubRule.class, Cnd.NEW()); + Cnd cnd = Cnd.NEW(); + if(StrUtil.isNotBlank(clubRule.getId())) { + cnd.and(SysClubRule::getId, "!=", clubRule.getId()); + } + List list = dao.query(SysClubRule.class, cnd); List idList = list.stream().map(SysClubRule::getId).toList(); int count = dao.count(BpmProcessInstance.class, Cnd.where(BpmProcessInstance::getProcessInstanceBusinessId, "in", idList).and(BpmProcessInstance::getProcessInstanceStatus, "!=", BpmProcessInstanceStatusEnum.COMPLETED)); if (count > 0) { diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubSchoolReplyController.java b/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubSchoolReplyController.java index 7812a05..a7f7f31 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubSchoolReplyController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/register/ClubSchoolReplyController.java @@ -125,7 +125,8 @@ public class ClubSchoolReplyController { RoleConstant.CLUB_PRESIDENT.name(), RoleConstant.CLUB_VICE_PRESIDENT.name(), RoleConstant.CLUB_SECRETARY.name(), - RoleConstant.CLUB_VICE_SECRETARY.name() + RoleConstant.CLUB_VICE_SECRETARY.name(), + RoleConstant.CLUB_OPERATOR.name() )); sysClubService.dao().clear(Sys_user_role.class, Cnd.where("clubId", "=", clubId) .and("roleId", "in", roleList)); 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 677f0a2..a3cf4a4 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 @@ -136,7 +136,8 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl implements 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 - WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_MEMBER"') THEN 5 + WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_OPERATOR"') THEN 5 + WHEN JSON_CONTAINS(scu.roleCode, '"CLUB_MEMBER"') THEN 6 ELSE 99 END """).setParam("clubId", clubId); 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 b586db6..df86aba 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 @@ -117,15 +117,14 @@ const CLUB_INFO_MANAGE_TEMPLATE = { - + - + 协会会长 协会副会长 diff --git a/src/main/resources/views/platform/zhghh5/activity/trainSignUp/activityInfo/index.html b/src/main/resources/views/platform/zhghh5/activity/trainSignUp/activityInfo/index.html index 53c7756..3da0937 100644 --- a/src/main/resources/views/platform/zhghh5/activity/trainSignUp/activityInfo/index.html +++ b/src/main/resources/views/platform/zhghh5/activity/trainSignUp/activityInfo/index.html @@ -47,12 +47,7 @@ layout("/layouts/platform_h5.html"){ }
- +
{{activity.activityName}}
diff --git a/src/main/resources/views/platform/zhghh5/activity/trainSignUp/trainInfo/index.html b/src/main/resources/views/platform/zhghh5/activity/trainSignUp/trainInfo/index.html index ae9e8dc..0a25c84 100644 --- a/src/main/resources/views/platform/zhghh5/activity/trainSignUp/trainInfo/index.html +++ b/src/main/resources/views/platform/zhghh5/activity/trainSignUp/trainInfo/index.html @@ -147,12 +147,7 @@ layout("/layouts/platform_h5.html"){ }
- + @@ -727,7 +722,8 @@ layout("/layouts/platform_h5.html"){ async pageData() { const resp = await this.$axios.post("/platform/mobile/trainSignUpActivity/findOne", { id: this.activityId, - tabIndex: this.activityStatus + tabIndex: this.activityStatus, + fromMode: 'mobile', }) if (resp.code === 0) { this.tableData = resp.data diff --git a/src/main/resources/views/platform/zhghh5/activity/trainSignUp/trainList/index.html b/src/main/resources/views/platform/zhghh5/activity/trainSignUp/trainList/index.html index 1260e39..69429c0 100644 --- a/src/main/resources/views/platform/zhghh5/activity/trainSignUp/trainList/index.html +++ b/src/main/resources/views/platform/zhghh5/activity/trainSignUp/trainList/index.html @@ -147,7 +147,7 @@ layout("/layouts/platform_h5.html"){ 活动列表 - 我报名的 + 我的报名