diff --git a/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Carousel.java b/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Carousel.java index b2c0e27..fb4e545 100644 --- a/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Carousel.java +++ b/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Carousel.java @@ -54,7 +54,7 @@ public class Carousel extends BaseEntity { @Schema(description = "标题") private String title; - @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.EAGER) + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "storage_id", referencedColumnName = "id") @Comment("图片文件") @Schema(description = "图片文件") diff --git a/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Course.java b/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Course.java index 9ea1b93..67e7dfc 100644 --- a/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Course.java +++ b/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Course.java @@ -62,19 +62,19 @@ public class Course extends BaseEntity { @Schema(description = "课程价格") private BigDecimal price; - @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.EAGER) + @ManyToOne(cascade = {CascadeType.PERSIST}, fetch = FetchType.EAGER) @JoinColumn(name = "course_description_storage_id", referencedColumnName = "id") @Comment("课程简介文件") @Schema(description = "课程简介文件") private Storage courseDescriptionStorage; - @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.EAGER) + @ManyToOne(cascade = {CascadeType.PERSIST}, fetch = FetchType.EAGER) @JoinColumn(name = "course_media_storage_id", referencedColumnName = "id") @Comment("课程音视频文件") @Schema(description = "课程音视频文件") private Storage courseMediaStorage; - @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.EAGER) + @ManyToOne(cascade = {CascadeType.PERSIST}, fetch = FetchType.EAGER) @JoinColumn(name = "course_cover_storage_id", referencedColumnName = "id") @Comment("课程封面文件") @Schema(description = "课程封面文件") diff --git a/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/CourseColumn.java b/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/CourseColumn.java index 736c99e..39effde 100644 --- a/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/CourseColumn.java +++ b/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/CourseColumn.java @@ -62,13 +62,13 @@ public class CourseColumn extends BaseEntity { @Schema(description = "课程专栏价格") private BigDecimal price; - @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.EAGER) + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "course_column_description_storage_id", referencedColumnName = "id") @Comment("课程专栏简介文件") @Schema(description = "课程专栏简介文件") private Storage courseColumnDescriptionStorage; - @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.EAGER) + @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "course_column_cover_storage_id", referencedColumnName = "id") @Comment("课程专栏封面文件") @Schema(description = "课程专栏封面文件") diff --git a/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Storage.java b/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Storage.java index 352eef0..fe23993 100644 --- a/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Storage.java +++ b/common/domain/src/main/java/org/funcode/portal/server/common/domain/ielts/Storage.java @@ -77,21 +77,21 @@ public class Storage extends BaseEntity { @ToString.Exclude private Set carousels; - @OneToMany(mappedBy = "courseDescriptionStorage", cascade = CascadeType.ALL) + @OneToMany(mappedBy = "courseDescriptionStorage") @JsonIgnore @Comment("课程简介") @Schema(description = "课程简介") @ToString.Exclude private Set descriptionCourses; - @OneToMany(mappedBy = "courseMediaStorage", cascade = CascadeType.ALL) + @OneToMany(mappedBy = "courseMediaStorage") @JsonIgnore @Comment("课程音视频") @Schema(description = "课程音视频") @ToString.Exclude private Set mediaCourses; - @OneToMany(mappedBy = "courseCoverStorage", cascade = CascadeType.ALL) + @OneToMany(mappedBy = "courseCoverStorage") @JsonIgnore @Comment("课程封面") @Schema(description = "课程封面") @@ -105,14 +105,14 @@ public class Storage extends BaseEntity { @ToString.Exclude private Set attachmentCourses; - @OneToMany(mappedBy = "courseColumnDescriptionStorage", cascade = CascadeType.ALL) + @OneToMany(mappedBy = "courseColumnDescriptionStorage") @JsonIgnore @Comment("课程专栏简介") @Schema(description = "课程专栏简介") @ToString.Exclude private Set descriptionCourseColumns; - @OneToMany(mappedBy = "courseColumnCoverStorage", cascade = CascadeType.ALL) + @OneToMany(mappedBy = "courseColumnCoverStorage") @JsonIgnore @Comment("课程专栏封面") @Schema(description = "课程专栏封面")