diff --git a/web/src/main/resources/sql/jlw/courseInfo.md b/web/src/main/resources/sql/jlw/courseInfo.md index 89dc19d9..98dfa7dd 100644 --- a/web/src/main/resources/sql/jlw/courseInfo.md +++ b/web/src/main/resources/sql/jlw/courseInfo.md @@ -906,7 +906,6 @@ getCourseSystemOAndUniversities AND ta.course_info_type = 1 AND ta.course_info_status = 1 AND a.course_label_status = 1 - AND a.course_label_type = '理论课程类' @if(!isEmpty(orgId)){ AND lb.org_id = #orgId# AND lb.use_type IN(1,2) diff --git a/web/src/main/resources/sql/jlw/resourcesInfo.md b/web/src/main/resources/sql/jlw/resourcesInfo.md index 621a028b..ea31e70c 100644 --- a/web/src/main/resources/sql/jlw/resourcesInfo.md +++ b/web/src/main/resources/sql/jlw/resourcesInfo.md @@ -181,7 +181,68 @@ getCurriculumResourceManagementList * 获取课程资源管理系统授权课+院校开课 SELECT @pageTag(){ - tt.* + tt.* + @} + FROM + ( + SELECT + t.add_type_text, + t.course_info_id, + t.course_info_name, + t.course_info_parent_name, + t.course_info_parent_id, + t.course_info_parent_parent_name, + t.course_info_parent_parent_id, + t.add_time, + t.order_index, + t.resources_info_content, + t.resources_info_files, + t.resources_info_id, + t.resources_info_name, + t.resources_info_type, + t.source_type + @if(!isEmpty(orgId)){ + , + IF(( + SELECT + a.org_id + FROM + universities_colleges_jurisdiction_curriculum_resources a + WHERE + a.org_id = #orgId# + AND a.use_type IN(1,2) + AND a.course_info_id = t.course_info_parent_parent_id + AND a.use_end_time > NOW() + ), + ( + SELECT + a.org_id + FROM + universities_colleges_jurisdiction_curriculum_resources a + WHERE + a.org_id = #orgId# + AND a.use_type IN(1,2) + AND a.course_info_id = t.course_info_parent_parent_id + AND a.use_end_time > NOW() + ), + ( + SELECT + a.org_id + FROM + teacher_open_course a + WHERE + a.teacher_open_course_status = 1 + AND a.teacher_open_course_id = t.course_info_parent_parent_id + )) AS org_id, + ( + SELECT + a.user_id + FROM + teacher_open_course a + WHERE + a.teacher_open_course_status = 1 + AND a.teacher_open_course_id = t.course_info_parent_parent_id + ) AS user_id @} FROM ( @@ -323,13 +384,11 @@ getCurriculumResourceManagementList lc.course_info_id) AS course_info_parent_parent_id, ta.add_time, ta.order_index, - ta.org_id, ta.resources_info_content, ta.resources_info_files, ta.resources_info_id, ta.resources_info_name, ta.resources_info_type, - ta.user_id, '2' AS source_type FROM resources_info ta @@ -477,13 +536,11 @@ getCurriculumResourceManagementList lbc.teacher_open_course_id) AS course_info_parent_parent_id, tb.add_time, tb.order_index, - tb.org_id, tb.resources_info_content, tb.resources_info_files AS resources_info_files, tb.teacher_open_course_merge_resources_info_id AS resources_info_id, tb.resources_info_name, tb.resources_info_type, - tb.user_id, '1' AS source_type FROM teacher_open_course_merge_resources_info tb @@ -493,10 +550,8 @@ getCurriculumResourceManagementList LEFT JOIN core_org lbd ON lbd.`ID` = tb.org_id AND lbd.DEL_FLAG = 0 WHERE tb.resources_info_status = 1 - @if(!isEmpty(orgId)){ - and tb.org_id =#orgId# - @} ) + ) t ) tt WHERE 1=1 @if(!isEmpty(resourcesInfoType)) { @@ -520,4 +575,7 @@ getCurriculumResourceManagementList @if(!isEmpty(sourceType)) { AND tt.source_type = #sourceType# @} + @if(!isEmpty(orgId)){ + AND tt.org_id = #orgId# + @} ORDER BY tt.add_time DESC \ No newline at end of file