From 046dc3ac03c047d65fa0575c13af2c5aa092a3b8 Mon Sep 17 00:00:00 2001
From: liuyiliang <azc78910>
Date: Mon, 15 Jul 2024 16:07:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/controller/UserController.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/energy/modules/system/controller/UserController.java b/src/main/java/org/energy/modules/system/controller/UserController.java
index 734706b..c1aac8c 100644
--- a/src/main/java/org/energy/modules/system/controller/UserController.java
+++ b/src/main/java/org/energy/modules/system/controller/UserController.java
@@ -300,13 +300,17 @@ public class UserController {
 	 * 远程搜索
 	 */
 	@GetMapping("/listBySearch")
-	@ApiOperationSupport(order = 2)
+	@ApiOperationSupport(order = 16)
 	@ApiOperation(value = "远程搜索", notes = "传入")
-	public R<List<User>> listBySearch(String search) {
+	public R<List<User>> listBySearch(@RequestParam Map<String, Object> map) {
 		QueryWrapper<User> queryWrapper = new QueryWrapper<>();
-		if (io.micrometer.core.instrument.util.StringUtils.isNotEmpty(search)) {
-			queryWrapper.lambda().like(User::getName, search).or().like(User::getCode, search);
+		if (map != null && map.containsKey("search")) {
+			queryWrapper.lambda().like(User::getName, map.get("search")).or().like(User::getCode, map.get("search"));
+			if (map.get("search").toString().matches("\\d+")) {
+				queryWrapper.lambda().or().eq(User::getId, Long.parseLong(map.get("search").toString()));
+			}
 		}
+		queryWrapper.lambda().eq(User::getIsDeleted, DafConstant.DB_NOT_DELETED);
 		queryWrapper.lambda().orderByAsc(User::getCreateTime);
 		queryWrapper.lambda().last(" LIMIT 50");
 		List<User> list = userService.list(queryWrapper);