diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java index 0377c723..4dd4265f 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java @@ -21,6 +21,7 @@ import com.ibeetl.jlw.entity.ResourcesInfo; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeCourseInfo; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo; import com.ibeetl.jlw.entity.vo.ResourcesCourseInfoAuthDetailsVO; +import com.ibeetl.jlw.enums.GlobalUpStatusEnum; import com.ibeetl.jlw.enums.MoveEnum; import com.ibeetl.jlw.service.CourseInfoService; import com.ibeetl.jlw.service.ResourcesInfoService; @@ -398,6 +399,7 @@ public class ResourcesInfoController { item.setOrgId(coreUser.getOrgId()); item.setUserId(coreUser.getId()); item.setAddType(coreUser.isAdmin() ? ADMIN_ADD : FACULTY_ADD); + item.setResourcesInfoStatus(1); }); resourcesInfoService.addAll(resourcesInfoList); diff --git a/web/src/main/resources/sql/jlw/handsOn.md b/web/src/main/resources/sql/jlw/handsOn.md index f3bff14e..b4783db3 100644 --- a/web/src/main/resources/sql/jlw/handsOn.md +++ b/web/src/main/resources/sql/jlw/handsOn.md @@ -165,6 +165,7 @@ queryByConditionMergeOpenCourseHandsOn and za.`name` like #'%'+orgIdText+'%'# @} @} + ORDER BY t.add_time DESC diff --git a/web/src/main/resources/sql/jlw/resourcesInfo.md b/web/src/main/resources/sql/jlw/resourcesInfo.md index e8ff6bc1..b23703a1 100644 --- a/web/src/main/resources/sql/jlw/resourcesInfo.md +++ b/web/src/main/resources/sql/jlw/resourcesInfo.md @@ -400,7 +400,7 @@ getCurriculumResourceManagementList LEFT JOIN course_info lc ON lc.course_info_id = lb.course_info_parent_id AND lc.course_info_status = 1 LEFT JOIN core_org ld ON ld.`ID` = ta.org_id AND ld.DEL_FLAG = 0 WHERE - ta.resources_info_status != 0 + ta.resources_info_status != 0 or ta.resources_info_status is null ) UNION ALL (