From a26b55f24f4b9ab42c8bbd90e99a091b79ca56c5 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Thu, 12 Jan 2023 17:46:03 +0800
Subject: [PATCH] 1

---
 .../com/ibeetl/jlw/service/CourseInfoService.java     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java
index d290c1d4..802a4515 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java
@@ -49,6 +49,7 @@ import static cn.jlw.util.ConvertM3U8.booleanMap;
 import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUserId;
 import static java.lang.Math.min;
 import static java.math.BigDecimal.ROUND_HALF_UP;
+import static java.math.BigDecimal.ZERO;
 import static java.util.stream.Collectors.joining;
 
 
@@ -500,6 +501,8 @@ public class CourseInfoService extends CoreBaseService<CourseInfo>{
 
         buildCourseInfoResources(courseInfoList);
 
+        courseInfoList.sort((o1, o2) -> defaultIfNull(o1.getOrderIndex(), ZERO).subtract(defaultIfNull(o2.getOrderIndex(), ZERO)).intValue());
+
         return courseInfoList;
     }
 
@@ -1227,9 +1230,11 @@ public class CourseInfoService extends CoreBaseService<CourseInfo>{
         if (calcedOrder != null) {
             // 改变排序记录值
             CourseInfo updatePO = new CourseInfo();
-            updatePO.setCourseInfoId(mergeCourseInfo.getCourseInfoId());
+            updatePO.setCourseInfoId(id);
             updatePO.setOrderIndex(BigDecimal.valueOf(calcedOrder));
             updateTemplate(updatePO);
+
+            flushCache(id);
         }
     }
 
@@ -1320,9 +1325,11 @@ public class CourseInfoService extends CoreBaseService<CourseInfo>{
         // 最后更新排序值
         if (clacedOrder != null) {
             CourseInfo updatePO = new CourseInfo();
-            updatePO.setCourseInfoId(selfElement.getCourseInfoId());
+            updatePO.setCourseInfoId(id);
             updatePO.setOrderIndex(clacedOrder);
             updateTemplate(updatePO);
+
+            flushCache(id);
         }
     }
 }
\ No newline at end of file