From 4d79c8c51dc1c401ed83797c884bc014ca985f5d Mon Sep 17 00:00:00 2001
From: "liu.zixi" <liu.zixi@ebiz-digits.com>
Date: Fri, 12 Dec 2025 11:34:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90FCJDFDXTXS-82=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E7=BD=AE=E9=A1=B6=E5=8F=8A=E7=BD=AE=E9=A1=B6=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../course/service/impl/CoursePageServiceImpl.java     | 10 ++++++++--
 .../java/com/xboe/module/course/vo/CoursePageVo.java   |  9 ++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CoursePageServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CoursePageServiceImpl.java
index 1695cb00..93368371 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CoursePageServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CoursePageServiceImpl.java
@@ -149,7 +149,8 @@ public class CoursePageServiceImpl implements ICoursePageService {
         }
         return courseList.stream()
                 .map(c -> convertToVo(c, courseTeacherList))
-                .sorted(Comparator.comparing(CoursePageVo::getSortWeight, Comparator.nullsLast(Comparator.naturalOrder())))
+                .sorted(Comparator.comparing(CoursePageVo::getSortWeight, Comparator.nullsLast(Comparator.naturalOrder()))
+                        .thenComparing(CoursePageVo::getTopTime, Comparator.nullsLast(Comparator.reverseOrder())))
                 .collect(Collectors.toList());
     }
 
@@ -173,7 +174,8 @@ public class CoursePageServiceImpl implements ICoursePageService {
             // 2.3 设置置顶
             courseDao.updateMultiFieldById(courseId,
                     UpdateBuilder.create("isTop", top),
-                    UpdateBuilder.create("topTime", LocalDateTime.now()));
+                    UpdateBuilder.create("topTime", LocalDateTime.now()),
+                    UpdateBuilder.create("sortWeight", 0));
         } else {
             // 3. 取消置顶
             // 3.1 课程是否已置顶
@@ -380,17 +382,21 @@ public class CoursePageServiceImpl implements ICoursePageService {
         vo.setSysCreateBy(course.getSysCreateBy());
         vo.setCreateFrom(course.getCreateFrom());
         vo.setSysCreateTime(course.getSysCreateTime());
+        vo.setSysUpdateTime(course.getSysUpdateTime());
         vo.setForUsers(course.getForUsers());
         vo.setStatus(course.getStatus());
         // auditType 需要从其他地方获取，这里暂时设置为默认值
         vo.setAuditType(1);
         vo.setPublished(course.getPublished());
+        vo.setPublishTime(course.getPublishTime());
         vo.setStudys(course.getStudys());
         vo.setScore(course.getScore());
         // courseDuration 需要计算，这里暂时设置为默认值
         vo.setCourseDuration(course.getCourseDuration());
         vo.setEnabled(course.getEnabled());
         vo.setSortWeight(course.getSortWeight());
+        vo.setTopTime(course.getTopTime());
+        vo.setIsTop(course.getIsTop());
         
         // 获取教师名称
         List<String> teacherNames = courseTeacherList.stream()
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/vo/CoursePageVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/vo/CoursePageVo.java
index a5c2f74a..7076bee3 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/vo/CoursePageVo.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/vo/CoursePageVo.java
@@ -173,6 +173,13 @@ public class CoursePageVo {
      */
     private Boolean isTop;
 
+    /**
+     * 置顶时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime topTime;
+
     /**
      * 排序权重
      */
@@ -184,4 +191,4 @@ public class CoursePageVo {
      * TODO 在线课优化二期会对此字段进行其他的赋值操作
      */
     private Boolean isPermission = true;
-}
+}
\ No newline at end of file