From 25706c5f8300d69586493749290ca229e81fe18f Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 13 Jun 2024 15:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=BF=94=E5=9B=9E=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E6=B7=BB=E5=8A=A0user=20=E4=BF=AE=E6=94=B9=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/controller/CourseGuestbookController.java       | 7 ++++++-
 .../common/service/impl/CourseGuestbookServiceImpl.java    | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java b/src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java
index edcca70f..1fa1b429 100644
--- a/src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java
+++ b/src/main/java/com/peanut/modules/common/controller/CourseGuestbookController.java
@@ -5,6 +5,7 @@ import com.peanut.common.utils.R;
 import com.peanut.modules.common.entity.CourseGuestbook;
 import com.peanut.modules.common.entity.CourseGuestbookSupport;
 import com.peanut.modules.common.service.CourseGuestbookService;
+import com.peanut.modules.common.service.MyUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,6 +21,8 @@ public class CourseGuestbookController {
 
     @Autowired
     private CourseGuestbookService service;
+    @Autowired
+    private MyUserService userService;
 
     @RequestMapping("/getCourseGuestbookList")
     public R getCourseGuestbookList(@RequestBody Map<String,Object> map){
@@ -30,7 +33,9 @@ public class CourseGuestbookController {
     @RequestMapping("/addCourseGuestbook")
     public R addCourseGuestbook(@RequestBody CourseGuestbook courseGuestbook){
         service.save(courseGuestbook);
-        return R.ok().put("courseGuestbook",service.getById(courseGuestbook.getId()));
+        CourseGuestbook res = service.getById(courseGuestbook.getId());
+        res.setUser(userService.getById(res.getUserId()));
+        return R.ok().put("courseGuestbook",res);
     }
 
     @RequestMapping("/addCourseGuestbookSupport")
diff --git a/src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java
index 2722eb65..1cc4b58b 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/CourseGuestbookServiceImpl.java
@@ -41,14 +41,14 @@ public class CourseGuestbookServiceImpl extends ServiceImpl<CourseGuestbookDao,
             wrapper.eq(CourseGuestbook::getChapterId,map.get("chapterId"));
         }
         wrapper.eq(CourseGuestbook::getPid,0);
-        wrapper.orderByAsc(CourseGuestbook::getCreateTime);
+        wrapper.orderByDesc(CourseGuestbook::getCreateTime);
         Page<CourseGuestbook> courseGuestbookPage = this.getBaseMapper().selectPage(new Page<>(page, limit), wrapper);
         if (courseGuestbookPage != null&&courseGuestbookPage.getRecords().size() > 0){
             for (CourseGuestbook courseGuestbook : courseGuestbookPage.getRecords()) {
                 courseGuestbook.setUser(userDao.selectById(courseGuestbook.getUserId()));
                 MPJLambdaWrapper<CourseGuestbook> w = new MPJLambdaWrapper();
                 w.eq(CourseGuestbook::getPid,courseGuestbook.getId());
-                w.orderByAsc(CourseGuestbook::getCreateTime);
+                w.orderByDesc(CourseGuestbook::getCreateTime);
                 List<CourseGuestbook> list = this.getBaseMapper().selectList(w);
                 if (list.size() > 0) {
                     for (CourseGuestbook c : list){