diff --git a/src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityServiceImpl.java index 0134f58..f7678da 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityServiceImpl.java @@ -53,13 +53,18 @@ public class FamilyActivityServiceImpl extends BaseServiceImpl i //插入类型限制 List typeLimits = activity.getTypeLimits(); - typeLimits.forEach(v -> v.setActivityId(activity.getId())); + typeLimits.forEach(v -> { + v.setId(null); + v.setActivityId(activity.getId()); + }); dao().insert(typeLimits); List courseList = activity.getCourseList(); for (FamilyCourse v : courseList) { + v.setId(null); v.setActivityId(activity.getId()); v.setOpenOtherUnion(false); + v.getCourseTimeList().forEach(courseTime -> courseTime.setId(null)); dao().insert(v); this.setCourseTimeAndInsert(v); } diff --git a/src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js b/src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js index 2ab8cd8..7c4ea1a 100644 --- a/src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js +++ b/src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js @@ -503,6 +503,23 @@ const basicForm = { this.formData = resp.data this.typeChange(this.formData.trainType) this.formData.id = "" + this.formData.courseList.forEach((course) => { + course.id = "" + course.activityId = "" + if (course.courseTimeList) { + course.courseTimeList.forEach((courseTime) => { + courseTime.id = "" + courseTime.activityId = "" + courseTime.courseId = "" + }) + } + }) + if (this.formData.typeLimits) { + this.formData.typeLimits.forEach((typeLimit) => { + typeLimit.id = "" + typeLimit.activityId = "" + }) + } } }, typeChange(val) {