From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/circle/controller/CircleLikeController.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/circle/controller/CircleLikeController.java b/src/main/java/org/springblade/modules/circle/controller/CircleLikeController.java
index 16775da..5e0299b 100644
--- a/src/main/java/org/springblade/modules/circle/controller/CircleLikeController.java
+++ b/src/main/java/org/springblade/modules/circle/controller/CircleLikeController.java
@@ -16,8 +16,8 @@
  */
 package org.springblade.modules.circle.controller;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,7 +29,6 @@
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.article.entity.ArticleLikeEntity;
 import org.springblade.modules.circle.entity.CircleLikeEntity;
 import org.springblade.modules.circle.service.ICircleLikeService;
 import org.springblade.modules.circle.vo.CircleLikeVO;
@@ -114,10 +113,14 @@
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入circle")
 	public R submit(@Valid @RequestBody CircleLikeEntity circle) {
-		UpdateWrapper<CircleLikeEntity> objectUpdateWrapper = new UpdateWrapper<>();
-		objectUpdateWrapper.eq("user_id", circle.getUserId());
-		objectUpdateWrapper.eq("circle_id", circle.getCircleId());
-		return R.status(circleService.saveOrUpdate(circle,objectUpdateWrapper));
+		circle.setUserId(AuthUtil.getUserId());
+		CircleLikeEntity one = circleService.getOne(Wrappers.<CircleLikeEntity>lambdaQuery()
+			.eq(CircleLikeEntity::getCircleId, circle.getCircleId())
+			.eq(CircleLikeEntity::getUserId, circle.getUserId()));
+		if (one != null) {
+			circle.setId(one.getId());
+		}
+		return R.status(circleService.saveOrUpdate(circle));
 	}
 
 	/**

--
Gitblit v1.9.3