From 8ae3d648d8cdc88eea240cf05e36dd00aef73b23 Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Mon, 24 Jul 2023 15:27:11 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=BE=E7=A8=8B=E5=AE=9E=E8=AE=AD?=
=?UTF-8?q?=E6=A1=88=E4=BE=8B=E7=AE=A1=E7=90=86=E6=8E=92=E5=BA=8F=202?=
=?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/ibeetl/jlw/web/ResourcesInfoController.java | 2 ++
web/src/main/resources/sql/jlw/handsOn.md | 1 +
web/src/main/resources/sql/jlw/resourcesInfo.md | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
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
(