From e7909ba9349bbb44eedcbf08ceac4249e89c2881 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Tue, 7 May 2024 18:19:17 +0800
Subject: [PATCH] bug

---
 .../service/impl/BuyOrderServiceImpl.java     |  2 +-
 .../common/controller/MessageController.java  | 27 ++++++-------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
index 9305995f..dafc3b7c 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
@@ -786,7 +786,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             List<BookEntity> bookByProductId = shopProductBookService.getBookByProductId(buyOrderProduct.getProductId());
             goodsResponseVo.setBooks(bookByProductId);
 
-            //设置商品对应的课程目录
+            //设置商品对应的课程
             List<Integer> collect = shopProductCourseDao.selectList(new LambdaQueryWrapper<ShopProductCourseEntity>().eq(ShopProductCourseEntity::getProductId, buyOrderProduct.getProductId())).stream().map(ShopProductCourseEntity::getCatalogueId).collect(Collectors.toList());
             if(collect.size()>0){
                 MPJLambdaWrapper<CourseCatalogueEntity> courseCatalogueEntityMPJLambdaWrapper = new MPJLambdaWrapper<>();
diff --git a/src/main/java/com/peanut/modules/common/controller/MessageController.java b/src/main/java/com/peanut/modules/common/controller/MessageController.java
index 1336eedd..4e54bd68 100644
--- a/src/main/java/com/peanut/modules/common/controller/MessageController.java
+++ b/src/main/java/com/peanut/modules/common/controller/MessageController.java
@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,27 +27,14 @@ public class MessageController {
     private MessageService messageService;
 
     @RequestMapping("/listByPage")
-    public R listByPage(@RequestBody Map<String, Object> params) {
+    public R listByPage(@RequestBody Message message) {
         LambdaQueryWrapper<Message> wrapper = new LambdaQueryWrapper();
-        if (params.containsKey("title")&& StringUtils.isNotEmpty(params.get("title").toString())) {
-            wrapper.like(Message::getTitle,params.get("title"));
-        }
-        if (params.containsKey("type")&& StringUtils.isNotEmpty(params.get("type").toString())) {
-            wrapper.eq(Message::getType,params.get("type"));
-        }
-        if (params.containsKey("isBook")&& StringUtils.isNotEmpty(params.get("isBook").toString())) {
-            wrapper.eq(Message::getIsBook,params.get("isBook"));
-        }
-        if (params.containsKey("isMedical")&& StringUtils.isNotEmpty(params.get("isMedical").toString())) {
-            wrapper.eq(Message::getIsBook,params.get("isMedical"));
-        }
-        if (params.containsKey("isSociology")&& StringUtils.isNotEmpty(params.get("isSociology").toString())) {
-            wrapper.eq(Message::getIsBook,params.get("isSociology"));
-        }
+        wrapper.eq(message.getIsBook()==1,Message::getIsBook,1);
+        wrapper.eq(message.getIsMedical()==1,Message::getIsMedical,1);
+        wrapper.eq(message.getIsSociology()==1,Message::getIsSociology,1);
         wrapper.orderByDesc(Message::getCreateTime);
-        Page<Message> page = messageService.page(new Page<>(
-                Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper);
-        return R.ok().put("result", page);
+        List<Message> messages = messageService.getBaseMapper().selectList(wrapper);
+        return R.ok().put("messages", messages);
     }
 
     @RequestMapping("/getMessageById")