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/CircleController.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 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 288862e..eb2f85a 100644
--- a/src/main/java/org/springblade/modules/circle/controller/CircleController.java
+++ b/src/main/java/org/springblade/modules/circle/controller/CircleController.java
@@ -16,26 +16,26 @@
  */
 package org.springblade.modules.circle.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.apache.logging.log4j.util.Strings;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.modules.circle.entity.CircleEntity;
+import org.springblade.modules.circle.service.ICircleService;
 import org.springblade.modules.circle.vo.CircleVO;
 import org.springblade.modules.circle.wrapper.CircleWrapper;
-import org.springblade.modules.circle.service.ICircleService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
 
 /**
  * 圈子表 控制器
@@ -61,6 +61,7 @@
 		CircleEntity detail = circleService.getOne(Condition.getQueryWrapper(circle));
 		return R.data(CircleWrapper.build().entityVO(detail));
 	}
+
 	/**
 	 * 圈子表 分页
 	 */
@@ -91,8 +92,11 @@
 	@ApiOperationSupport(order = 4)
 	@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