From 646cd50a42e35d9bbb6d217c740b6e92f8a87480 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Thu, 9 Feb 2023 00:39:50 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E5=AF=BC=E5=85=A5=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jlw/service/TeacherOpenCourseMergeCourseInfoService.java  | 4 +++-
 .../resources/sql/jlw/teacherOpenCourseScheduleSession.md     | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
index 3b1f4d78..c7d9c930 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
@@ -769,7 +769,9 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
 
     private void courseInfoListConvertTeacherOpenCourseMergeCourseInfoList(@NotNull List<CourseInfo> chapterList, @NotNull Collection<TeacherOpenCourseMergeCourseInfo> result) {
         // 拷贝部分字段映射
-        CopyOptions copyOptions = CopyOptions.create().setFieldMapping(MapUtil.of("courseInfoId", "teacherOpenCourseMergeCourseInfoId"));
+        HashMap<String, String> mapping = MapUtil.of("courseInfoId", "teacherOpenCourseMergeCourseInfoId");
+        mapping.put("orderIndex", "teacherOpenCourseMergeCourseInfoOrder");
+        CopyOptions copyOptions = CopyOptions.create().setFieldMapping(mapping);
         List<TeacherOpenCourseMergeCourseInfo> copyToList =
                 BeanUtil.copyToList(chapterList, TeacherOpenCourseMergeCourseInfo.class, copyOptions);
 
diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md b/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md
index e3d92d22..36d315d9 100644
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md
@@ -188,6 +188,7 @@ queryByConditionGroup
   t.org_id,
   t.user_id
   )tz
+  order by tz.teacher_open_course_schedule_session_add_time desc
 
 queryByConditionQuery
 ===