From 20bcc445da02ea54bcaeb821bf53f71ca13b0be9 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Tue, 2 Apr 2024 09:32:12 +0800
Subject: [PATCH] 1

---
 .../com/peanut/modules/common/entity/CourseEntity.java    | 2 ++
 .../modules/master/controller/CourseController.java       | 8 ++++----
 .../modules/master/service/impl/CourseServiceImpl.java    | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java
index 6f40d178..63d34b30 100644
--- a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java
+++ b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java
@@ -21,6 +21,8 @@ public class CourseEntity {
 
     private String title;
 
+    private Integer sort;
+
     private Date createTime;
 
     @TableLogic
diff --git a/src/main/java/com/peanut/modules/master/controller/CourseController.java b/src/main/java/com/peanut/modules/master/controller/CourseController.java
index cf4aa09c..875e63c6 100644
--- a/src/main/java/com/peanut/modules/master/controller/CourseController.java
+++ b/src/main/java/com/peanut/modules/master/controller/CourseController.java
@@ -107,14 +107,14 @@ public class CourseController {
 
     @RequestMapping("/getCourseCatalogueChapterVideoList")
     public R getCourseCatalogueChapterVideoList(@RequestBody ParamTo param){
-        courseCatalogueChapterVideoService.getCourseCatalogueChapterVideoList(param);
-        return R.ok();
+        Page courseCatalogueChapterVideoList = courseCatalogueChapterVideoService.getCourseCatalogueChapterVideoList(param);
+        return R.ok().put("page",courseCatalogueChapterVideoList);
     }
 
     @RequestMapping("/addCourseCatalogueChapterVideo")
     public R addCourseCatalogueChapterVideo(@RequestBody CourseCatalogueChapterVideoEntity courseCatalogueChapterVideoEntity){
-        courseCatalogueChapterVideoService.save(courseCatalogueChapterVideoEntity);
-        return R.ok();
+        boolean save = courseCatalogueChapterVideoService.save(courseCatalogueChapterVideoEntity);
+        return save?R.ok():R.error("error");
     }
 
     @RequestMapping("/delCourseCatalogueChapterVideo")
diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
index 8f45e8ce..ce409daf 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
@@ -74,7 +74,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
         if(ObjectUtils.isNotBlank(map,"keywords")){
             wrapper.like(CourseEntity::getTitle,map.get("keywords").toString());
         }
-
+        wrapper.orderByAsc(CourseEntity::getSort);
         Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectPage(new Page<>(page, limit), wrapper);
         for (CourseEntity c:courseEntityPage.getRecords()){
             List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, c.getId()).orderByAsc(CourseCatalogueEntity::getSort));