From 3dbf38aadab6e0e455b4c8484e9a072c64d30e04 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Fri, 27 Mar 2026 16:27:06 +0800 Subject: [PATCH] commit --- .../basic/controller/ActivityBasicScopeController.java | 2 ++ .../platform/zhgh/activity/culture/common/applyActivity.js | 6 +++--- .../platform/zhgh/activity/culture/common/applyUser.js | 3 ++- .../platform/zhgh/activity/culture/common/auditActivity.js | 3 ++- .../platform/zhgh/activity/culture/common/infoActivity.js | 2 +- .../platform/zhgh/activity/culture/common/infoMange.js | 3 ++- .../platform/zhgh/activity/culture/common/singleSignUp.js | 2 +- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java index bd650fa..fb19ae9 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java @@ -392,6 +392,8 @@ public class ActivityBasicScopeController { } catch (Exception e) { throw new RuntimeException(e); } + + cnd.and("u.member", "=", 1); return cnd; } 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 4e957e1..a080766 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 @@ -587,7 +587,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { groupId: [{required: true, message: "必填", trigger: ["blur", "change"]}], name: [{required: true, message: "必填", trigger: ["blur", "change"]}], type: [{required: true, message: "必填", trigger: ["blur", "change"]}], - projectTypeCode: [{required: true, message: "必填", trigger: ["blur", "change"]}], + //projectTypeCode: [{required: true, message: "必填", trigger: ["blur", "change"]}], address: [{required: true, message: "必填", trigger: ["blur", "change"]}], plannedDate: [{required: true, message: "必填", trigger: ["blur", "change"]}], time: [{required: true, message: "必填", trigger: ["blur", "change"]}], @@ -647,10 +647,10 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { }, // 保存 onSave() { - if (!this.formData.projectTypeCode) { + /*if (!this.formData.projectTypeCode) { this.$message.error("请选择活动项目类型") return - } + }*/ if (!this.formData.clubId && this.activity_type === 40003) { this.$message.error("请选择活动所属协会") return diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js index 56ae75a..638ac76 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js @@ -56,7 +56,8 @@ const ACTIVITY_CULTURE_APPLY_USER = { {{row.startTime}} 至 {{row.endTime}}