From 33ae4a5464b2c65a74b7ec88398e51f9048ee48b Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Tue, 10 Jan 2023 02:04:51 +0800
Subject: [PATCH] 1

---
 .../jlw/web/query/TeacherOpenCourseQuery.java      | 10 ++++++++++
 .../main/resources/sql/jlw/teacherOpenCourse.md    | 14 ++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuery.java
index e0fcc505..b0bf5c35 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuery.java
@@ -56,6 +56,8 @@ public class TeacherOpenCourseQuery extends PageParam {
     private String orgIdPlural;
     private String userIdPlural;
 
+    private String courseLabelIdPlural;
+
     private String teacherOpenCourseJsonStr;//json格式
 
     private String _given;//指定更新的特定字段，多个逗号隔开
@@ -236,4 +238,12 @@ public class TeacherOpenCourseQuery extends PageParam {
     public void setTeacherOpenCourseSummary(String teacherOpenCourseSummary) {
         this.teacherOpenCourseSummary = teacherOpenCourseSummary;
     }
+
+    public String getCourseLabelIdPlural() {
+        return courseLabelIdPlural;
+    }
+
+    public void setCourseLabelIdPlural(String courseLabelIdPlural) {
+        this.courseLabelIdPlural = courseLabelIdPlural;
+    }
 }
diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourse.md b/web/src/main/resources/sql/jlw/teacherOpenCourse.md
index 62f58a43..83723eeb 100644
--- a/web/src/main/resources/sql/jlw/teacherOpenCourse.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourse.md
@@ -9,6 +9,8 @@ queryByCondition
   from teacher_open_course t
   left join teacher_open_course_merge_teacher ta on ta.teacher_open_course_id = t.teacher_open_course_id
   left join teacher tb on tb.teacher_id = ta.teacher_id and tb.teacher_status = 1
+  left join (select max(course_label_id) as course_label_id, teacher_open_course_id from teacher_open_course_merge_course_info where course_label_id is not null group by teacher_open_course_id) tc
+  on tc.teacher_open_course_id = t.teacher_open_course_id
   where 1=1  
     @//数据权限，该sql语句功能点,如果不考虑数据权限，可以删除此行  
   and #function("teacherOpenCourse.query")#
@@ -63,7 +65,10 @@ queryByCondition
     @if(!isEmpty(teacherOpenCourseMergeAuthCode)){
   and ta.teacher_open_course_merge_teacher_auth_code =#teacherOpenCourseMergeAuthCode#
     @}
-  order by ta.teacher_open_course_merge_teacher_order_index desc
+  @if(!isEmpty(courseLabelIdPlural)){
+  and find_in_set(tc.course_label_id, #courseLabelIdPlural#)
+  @}
+  order by ta.teacher_open_course_merge_teacher_order_index asc
 
 
 queryByConditionQuery
@@ -77,6 +82,8 @@ queryByConditionQuery
   from teacher_open_course t
   left join teacher_open_course_merge_teacher ta on ta.teacher_open_course_id = t.teacher_open_course_id
   left join teacher tb on tb.teacher_id = ta.teacher_id and tb.teacher_status = 1
+  left join (select max(course_label_id) as course_label_id, teacher_open_course_id from teacher_open_course_merge_course_info where course_label_id is not null group by teacher_open_course_id) tc
+  on tc.teacher_open_course_id = t.teacher_open_course_id
   where 1=1  
     @if(!isEmpty(teacherOpenCourseId)){
   and t.teacher_open_course_id =#teacherOpenCourseId#
@@ -129,7 +136,10 @@ queryByConditionQuery
     @if(!isEmpty(teacherOpenCourseMergeAuthCode)){
   and ta.teacher_open_course_merge_teacher_auth_code =#teacherOpenCourseMergeAuthCode#
     @}
-  order by ta.teacher_open_course_merge_teacher_order_index desc
+    @if(!isEmpty(courseLabelIdPlural)){
+  and find_in_set(tc.course_label_id, #courseLabelIdPlural#)
+    @}
+  order by ta.teacher_open_course_merge_teacher_order_index asc
 
 deleteTeacherOpenCourseByIds
 ===