From 1cad14bca191807e18705c3a5526eda8151be439 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 14 四月 2025 23:10:22 +0800
Subject: [PATCH] 批量审核和图片保存bug

---
 ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 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..dcaa876 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
@@ -1,10 +1,12 @@
 package com.ycl.controller.message;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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,29 +44,32 @@
     @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);
     }
 
     @ApiOperation("淇敼鎸囧畾鏍忕洰")
-    @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
-    public CommonResult update(@PathVariable Long id, @RequestBody MessageColumnSet messageColumnSet) {
-        messageColumnSet.setId(id);
-        boolean success = iMessageColumnSetService.updateById(messageColumnSet);
+    public CommonResult update( @RequestBody MessageColumnSet messageColumnSet) {
+        if (iMessageColumnSetService.getOne(new LambdaQueryWrapper<MessageColumnSet>().eq(MessageColumnSet::getMessageColumnId,messageColumnSet.getMessageColumnId())
+                .eq(MessageColumnSet::getUserId,messageColumnSet.getUserId()))==null){
+            iMessageColumnSetService.save(messageColumnSet);
+        }
+        boolean success = iMessageColumnSetService.update(messageColumnSet,new LambdaQueryWrapper<MessageColumnSet>()
+                .eq(MessageColumnSet::getMessageColumnId,messageColumnSet.getMessageColumnId())
+                .eq(MessageColumnSet::getUserId,messageColumnSet.getUserId()));
         if (success) {
             return CommonResult.success(null);
         }

--
Gitblit v1.8.0