From 7216481a1ad6c6b0f8e85c46f53bcf59fb6e77c3 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Sat, 1 Nov 2025 11:19:19 +0800 Subject: [PATCH] commit --- ...ctivityCultureApplyActivityController.java | 2 +- .../zhgh/welfare/model/WelfareProject.java | 1 + .../activity/culture/common/applyActivity.js | 29 ++++++++++++------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java index e88821fc..f98879e5 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java @@ -149,7 +149,7 @@ public class ActivityCultureApplyActivityController { } return Result.success(); } - if (tissue.getIsUnseal()!=null && tissue.getIsUnseal() && tissue.getIsEnrollSystem()) { + if ( tissue.getIsEnrollSystem()) { Sys_home_activity sysHomeActivity = tissue.covertToSysHomeActivity(); activityCultureService.insertOrUpdate(sysHomeActivity); } diff --git a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java index 6e507c00..23c73483 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/model/WelfareProject.java @@ -122,6 +122,7 @@ public class WelfareProject extends BaseModel implements SysHomeConvert { @Column @Comment("最多选几个") + @Default("1") @ColDefine(type = ColType.INT) private Integer multiSelectNum; diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js index bee48a3d..f0a4ea08 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js @@ -657,14 +657,17 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { userData: JSON.stringify(this.userData) }).then(res => { if (res.code === 0) { - this.$message.success("保存成功") this.$emit("goBack") + this.$message.success("提交成功") if (this.activity_type === 40002) { - commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") + location.href = "/platform/activity/culture/infoManage/union" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") } else if (this.activity_type === 40003) { - commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") + location.href = "/platform/activity/culture/infoManage/club" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") } else { - commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") + location.href = "/platform/activity/culture/infoManage/school" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") } } }) @@ -702,11 +705,14 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { this.$emit("goBack") this.$message.success("提交成功") if (this.activity_type === 40002) { - commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") + location.href = "/platform/activity/culture/infoManage/union" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") } else if (this.activity_type === 40003) { - commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") + location.href = "/platform/activity/culture/infoManage/club" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") } else { - commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") + location.href = "/platform/activity/culture/infoManage/school" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") } } }) @@ -745,11 +751,14 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { this.$emit("goBack") this.$message.success("提交成功") if (this.activity_type === 40002) { - commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") + location.href = "/platform/activity/culture/infoManage/union" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/union") } else if (this.activity_type === 40003) { - commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") + location.href = "/platform/activity/culture/infoManage/club" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/club") } else { - commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") + location.href = "/platform/activity/culture/infoManage/school" + // commonUtil.pjaxPush("/platform/activity/culture/infoManage/school") } } })