From 39f08dd934cde1a02f1c243faa43174fa474c87f Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 08 十一月 2022 11:11:35 +0800
Subject: [PATCH] 消息中心展示

---
 ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java
index 1f29c0d..cfc1583 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java
@@ -5,6 +5,7 @@
 import com.ycl.api.CommonResult;
 import com.ycl.entity.message.MessageColumnSet;
 import com.ycl.service.message.IMessageColumnSetService;
+import com.ycl.vo.message.MessageColumnSetVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -42,20 +43,18 @@
     @ApiOperation("鑾峰彇鎸囧畾鏍忕洰")
     @RequestMapping(value = "/getColumnSet/{id}", method = RequestMethod.GET)
     @ResponseBody
-    public CommonResult<MessageColumnSet> getMessage(@PathVariable Long id) {
+    public CommonResult<MessageColumnSet> getColumnSet(@PathVariable Long id) {
         MessageColumnSet columnSet = iMessageColumnSetService.getById(id);
         return CommonResult.success(columnSet);
     }
     @ApiOperation("鑾峰彇鐢ㄦ埛鏍忕洰璁剧疆")
-    @RequestMapping(value = "/getUserColumnSet/{userId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/getUserColumnSet", method = RequestMethod.GET)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛Id",required = true, dataType = "Long")
     })
     @ResponseBody
-    public CommonResult<List<MessageColumnSet>> getUserColumnSet(@PathVariable Long userId) {
-        QueryWrapper<MessageColumnSet> setQueryWrapper = new QueryWrapper<>();
-        setQueryWrapper.eq("user_id", userId);
-        List<MessageColumnSet> sets = iMessageColumnSetService.list(setQueryWrapper);
+    public CommonResult<List<MessageColumnSetVO>> getUserColumnSet(@RequestParam Long userId) {
+        List<MessageColumnSetVO> sets = iMessageColumnSetService.listColumnAndPage(userId);
         return CommonResult.success(sets);
     }
 

--
Gitblit v1.8.0