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 17e3294c..7a409b1d 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 @@ -96,14 +96,10 @@ public class ClubUserJoinApprovalController { cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); cnd.andEX("YEAR(info.applyDate)","=",pageForm.getYear()); - cnd.and(Cnd.likeEX("info.userName", pageForm.getUserName())); - cnd.and(Cnd.likeEX("info.loginName", pageForm.getLoginName())); - cnd.andEX("info.unionId","=",pageForm.getUnionId()); - cnd.andEX("info.unitId","=",pageForm.getUnitId()); - - if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){ - cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname()))); - } + cnd.and(Cnd.likeEX("u.userName", pageForm.getUserName())); + cnd.and(Cnd.likeEX("u.loginName", pageForm.getLoginName())); + cnd.andEX("u.unionId","=",pageForm.getUnionId()); + cnd.andEX("u.unitId","=",pageForm.getUnitId()); if (approval) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinSchoolApprovalController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinSchoolApprovalController.java index e100c6ed..384da055 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinSchoolApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinSchoolApprovalController.java @@ -102,14 +102,10 @@ public class ClubUserJoinSchoolApprovalController { cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); cnd.andEX("YEAR(info.applyDate)", "=", pageForm.getYear()); - cnd.and(Cnd.likeEX("info.userName", pageForm.getUserName())); - cnd.and(Cnd.likeEX("info.loginName", pageForm.getLoginName())); - cnd.andEX("info.unionId", "=", pageForm.getUnionId()); - cnd.andEX("info.unitId", "=", pageForm.getUnitId()); - - if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { - cnd.and(new Static("JSON_CONTAINS( task.assignments, '\"%s\"' )".formatted(SecurityUtil.getUserLoginname()))); - } + cnd.and(Cnd.likeEX("u.userName", pageForm.getUserName())); + cnd.and(Cnd.likeEX("u.loginName", pageForm.getLoginName())); + cnd.andEX("u.unionId", "=", pageForm.getUnionId()); + cnd.andEX("u.unitId", "=", pageForm.getUnitId()); if (approval) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/club/vo/ClubUserJoinPageVo.java b/src/main/java/com/budwk/app/zhgh/club/vo/ClubUserJoinPageVo.java index 73f2bc55..451ede73 100644 --- a/src/main/java/com/budwk/app/zhgh/club/vo/ClubUserJoinPageVo.java +++ b/src/main/java/com/budwk/app/zhgh/club/vo/ClubUserJoinPageVo.java @@ -42,6 +42,6 @@ public class ClubUserJoinPageVo{ private String taskParentId; private String taskVariable; private String curTaskName; - private Boolean canRevoke; + private Integer canRevoke; private String startTaskId; } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceTypeController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceTypeController.java index 1924d4c2..b8a2bfe1 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceTypeController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceTypeController.java @@ -85,7 +85,7 @@ public class CondolenceTypeController { @ApiOperation("查询职工慰问类型") @SaCheckLogin public Result queryCondolenceType() { - List list = typeService.query(Cnd.NEW().desc(CondolenceType::getCode)); + List list = typeService.query(Cnd.where(CondolenceType::getEnable, "=", true).desc(CondolenceType::getCode)); return Result.success(list); } } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/model/CondolenceType.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/model/CondolenceType.java index b273ef66..b84fc553 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/model/CondolenceType.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/model/CondolenceType.java @@ -48,9 +48,10 @@ public class CondolenceType extends BaseModel { private String way; @Column - @Comment("是否禁用") + @Comment("是否启用") @ColDefine(type = ColType.BOOLEAN) - private Boolean isDisabled; + @Default("1") + private Boolean enable; @Column @Comment("是否上传附件") diff --git a/src/main/resources/views/platform/zhgh/club/join/apply/index.html b/src/main/resources/views/platform/zhgh/club/join/apply/index.html index 0180825f..c1bc6131 100644 --- a/src/main/resources/views/platform/zhgh/club/join/apply/index.html +++ b/src/main/resources/views/platform/zhgh/club/join/apply/index.html @@ -132,7 +132,7 @@ layout("/layouts/platform.html"){ store, data() { return { - id: GetQueryString("bizId"), + bizId: GetQueryString("bizId"), taskId: GetQueryString("taskId"), formData: {}, formRules: { @@ -195,7 +195,7 @@ layout("/layouts/platform.html"){ this.$message.warning("请先阅读并同意协议") return } - this.$axios.post('/platform/club/join/apply/submit/submitAgain', { + this.$axios.post('/platform/club/join/apply/submitAgain', { data: JSON.stringify(this.formData), taskId: GetQueryString("taskId") }).then(res => { @@ -225,12 +225,12 @@ layout("/layouts/platform.html"){ }) }, init() { - this.id = GetQueryString("id") + this.bizId = GetQueryString("bizId") if (GetQueryString("clubId")) { this.$set(this.formData, "clubId", GetQueryString("clubId")) } - if (this.id) { - this.$axios.post("/platform/club/join/apply/info", { id: this.id }).then((res) => { + if (this.bizId) { + this.$axios.post("/platform/club/join/apply/info", { id: this.bizId }).then((res) => { if (res.code === 0) { this.formData = res.data this.isAgree = true diff --git a/src/main/resources/views/platform/zhgh/club/join/mine/index.html b/src/main/resources/views/platform/zhgh/club/join/mine/index.html index bd06d7b5..42da0497 100644 --- a/src/main/resources/views/platform/zhgh/club/join/mine/index.html +++ b/src/main/resources/views/platform/zhgh/club/join/mine/index.html @@ -44,10 +44,7 @@ layout("/layouts/platform.html"){ 查看 编辑 撤回 - - 删除 - - + 删除 @@ -95,7 +92,7 @@ layout("/layouts/platform.html"){ }) }, onEdit(row) { - location.href = '/platform/club/join/apply?id=' + row.id + location.href = '/platform/club/join/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id }, onDelete(id) { this.$confirm("确定要删除此申请吗？", "提示", { diff --git a/src/main/resources/views/platform/zhgh/club/register/apply/index.html b/src/main/resources/views/platform/zhgh/club/register/apply/index.html index 8c237d3f..71bdaa6e 100644 --- a/src/main/resources/views/platform/zhgh/club/register/apply/index.html +++ b/src/main/resources/views/platform/zhgh/club/register/apply/index.html @@ -181,6 +181,11 @@ layout("/layouts/platform.html"){ await this.userRemoteMethod(resp.data.concatPerson) let formData = resp.data if (resp.data.clubUser.length > 0) { + resp.data.clubUser.forEach(item => { + if(item.roleCode) { + item.roleCode = JSON.parse(item.roleCode)[0] + } + }) resp.data.clubUser = resp.data.clubUser.filter((o) => o.roleCode !== "CLUB_MEMBER") } this.$refs.clubManagerRef.managePerson = clone(resp.data.clubUser) 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 ad16d5f0..7d8cbd7b 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 @@ -58,10 +58,7 @@ layout("/layouts/platform.html"){ 查看 编辑 撤回 - - 删除 - - + 删除 diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html index 6a58af58..00e21212 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html @@ -60,7 +60,7 @@ layout("/layouts/platform.html"){ diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/basicForm.js b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/basicForm.js index aac98416..dad39410 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/basicForm.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/basicForm.js @@ -24,19 +24,19 @@ const basicForm = { 慰问品 (C) - + - + 是 diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/index.html index 9695dc02..b8402343 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/index.html @@ -43,10 +43,10 @@ layout("/layouts/platform.html"){ 是 否 -