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> listBySearch(String search) { + public R> listBySearch(@RequestParam Map map) { QueryWrapper 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 list = userService.list(queryWrapper);