From c8ace3182393d64990e11b4bc05ce9e53203b393 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 17 八月 2023 10:11:46 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnSetController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 cfc1583..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,6 +1,7 @@
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;
@@ -59,11 +60,16 @@
}
@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