From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/circle/controller/CircleController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/circle/controller/CircleController.java b/src/main/java/org/springblade/modules/circle/controller/CircleController.java
index 60e4c1f..58ae838 100644
--- a/src/main/java/org/springblade/modules/circle/controller/CircleController.java
+++ b/src/main/java/org/springblade/modules/circle/controller/CircleController.java
@@ -21,8 +21,10 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
import javax.validation.Valid;
+import org.apache.logging.log4j.util.Strings;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -61,6 +63,7 @@
CircleEntity detail = circleService.getOne(Condition.getQueryWrapper(circle));
return R.data(CircleWrapper.build().entityVO(detail));
}
+
/**
* 圈子表 分页
*/
@@ -79,6 +82,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入circle")
public R<IPage<CircleVO>> page(CircleVO circle, Query query) {
+ circle.setUserIds(AuthUtil.getUserId());
IPage<CircleVO> pages = circleService.selectCirclePage(Condition.getPage(query), circle);
return R.data(pages);
}
@@ -91,7 +95,11 @@
@ApiOperation(value = "新增", notes = "传入circle")
public R save(@Valid @RequestBody CircleEntity circle) {
circle.setUserId(AuthUtil.getUserId());
- return R.status(circleService.save(circle));
+ String msg = circleService.saveCircle(circle);
+ if (!Strings.isBlank(msg)&& msg.equals("操作成功")){
+ return R.data(200,"",msg);
+ }
+ return R.data(201, "", msg);
}
/**
--
Gitblit v1.9.3