diff --git a/web/src/main/java/com/ibeetl/jlw/enums/GlobalUpStatusEnum.java b/web/src/main/java/com/ibeetl/jlw/enums/GlobalUpStatusEnum.java index ed2c312b..2580ed36 100644 --- a/web/src/main/java/com/ibeetl/jlw/enums/GlobalUpStatusEnum.java +++ b/web/src/main/java/com/ibeetl/jlw/enums/GlobalUpStatusEnum.java @@ -3,6 +3,7 @@ package com.ibeetl.jlw.enums; import lombok.AllArgsConstructor; import lombok.Getter; import org.beetl.sql.annotation.entity.EnumMapping; +import org.beetl.sql.annotation.entity.EnumValue; /** * 上下架状态 @@ -18,6 +19,7 @@ public enum GlobalUpStatusEnum { DOWN(2, "下架"), DEL(0, "删除"); + @EnumValue private Integer code; private String text; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java index 2434ce76..b94d3ff0 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java @@ -8,6 +8,8 @@ import com.ibeetl.jlw.enums.GlobalUpStatusEnum; import javax.validation.constraints.NotNull; +import static cn.hutool.core.util.ObjectUtil.defaultIfNull; + /** *开课资源拉取查询 */ @@ -99,7 +101,7 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam { pojo.setResourcesInfoContent(this.getResourcesInfoContent()); pojo.setResourcesInfoFiles(this.getResourcesInfoFiles()); pojo.setOrderIndex(this.getOrderIndex()); - pojo.setResourcesInfoStatus(this.getResourcesInfoStatus()); + pojo.setResourcesInfoStatus(defaultIfNull(this.getResourcesInfoStatus(), GlobalUpStatusEnum.UP)); pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); return pojo;