From 2427b05aeca08ee3c4998843bf749d35440d461b Mon Sep 17 00:00:00 2001 From: rentaiming <806181662@qq.com> Date: 星期六, 15 六月 2024 21:33:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java index 02fb8fc..2fa729a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java @@ -537,5 +537,17 @@ userService.deleteSupplier(id); return R.ok(); } - + + @InnerAuth + @GetMapping("/list-by-name") + R<List<SysUser>> getUserListByName(@RequestBody SysUser sysUser) { + List<SysUser> list = userService.lambdaQuery() + .like(StringUtils.isNotBlank(sysUser.getNickName()), SysUser::getNickName, + sysUser.getNickName()) + .like(StringUtils.isNotBlank(sysUser.getPhonenumber()), SysUser::getPhonenumber, + sysUser.getPhonenumber()) + .eq(SysUser::getUserType, "00") + .eq(SysUser::getDelFlag, 0).list(); + return R.ok(list); + } } -- Gitblit v1.7.1