From 583e9b9c72580addf907aba3f696339a739ba740 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sat, 1 Apr 2023 13:56:33 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20blade-system/user/search/user=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=9B=B4=E6=8D=A2=E4=B8=BAblade-system/search/user?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SearchController.java   | 24 +++++++++++++++++++
 .../system/controller/UserController.java     | 20 +---------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/SearchController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/SearchController.java
index 1f6d494a..d70bd160 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/SearchController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/SearchController.java
@@ -21,6 +21,8 @@ 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.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.Condition;
@@ -32,13 +34,16 @@ import org.springblade.system.entity.Post;
 import org.springblade.system.service.IDeptService;
 import org.springblade.system.service.IPostService;
 import org.springblade.system.service.IRoleService;
+import org.springblade.system.service.IUserService;
 import org.springblade.system.vo.DeptVO;
 import org.springblade.system.vo.PostVO;
 import org.springblade.system.vo.RoleVO;
+import org.springblade.system.vo.UserVO;
 import org.springblade.system.wrapper.PostWrapper;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -60,6 +65,8 @@ public class SearchController {
 
 	private final IPostService postService;
 
+	private final IUserService userService;
+
 	/**
 	 * 角色信息查询
 	 */
@@ -95,4 +102,21 @@ public class SearchController {
 		return R.data(PostWrapper.build().pageVO(pages));
 	}
 
+	/**
+	 * 用户列表查询
+	 */
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "name", value = "人员姓名", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "deptName", value = "部门名称", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "postName", value = "职位名称", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "current", value = "当前页数", paramType = "query", dataType = "int"),
+		@ApiImplicitParam(name = "size", value = "每页数量", paramType = "query", dataType = "int")
+	})
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "用户列表查询", notes = "用户列表查询")
+	@GetMapping("/user")
+	public R<IPage<UserVO>> userSearch(@ApiIgnore UserVO user, @ApiIgnore Query query) {
+		return R.data(userService.selectUserSearch(user, query));
+	}
+
 }
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java
index b0f9f69b..f2ff38c5 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java
@@ -298,29 +298,11 @@ public class UserController {
 	}
 
 
-	/**
-	 * 用户列表查询
-	 */
-	@ApiImplicitParams({
-		@ApiImplicitParam(name = "name", value = "人员姓名", paramType = "query", dataType = "string"),
-		@ApiImplicitParam(name = "deptName", value = "部门名称", paramType = "query", dataType = "string"),
-		@ApiImplicitParam(name = "postName", value = "职位名称", paramType = "query", dataType = "string"),
-		@ApiImplicitParam(name = "current", value = "当前页数", paramType = "query", dataType = "int"),
-		@ApiImplicitParam(name = "size", value = "每页数量", paramType = "query", dataType = "int")
-	})
-	@ApiOperationSupport(order = 18)
-	@ApiOperation(value = "用户列表查询", notes = "用户列表查询")
-	@GetMapping("/search/user")
-	public R<IPage<UserVO>> userSearch(@ApiIgnore UserVO user, @ApiIgnore Query query) {
-		return R.data(userService.selectUserSearch(user, query));
-	}
-
-
 	/**
 	 * 用户解锁
 	 */
 	@PostMapping("/unlock")
-	@ApiOperationSupport(order = 19)
+	@ApiOperationSupport(order = 18)
 	@ApiOperation(value = "账号解锁", notes = "传入id")
 	public R unlock(String userIds) {
 		if (StringUtil.isBlank(userIds)) {