diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 69b474d20..6723339f8 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -118,6 +118,44 @@ public class SysUserController { @Autowired private IProjectUserDutyTerritoryService projectUserDutyTerritoryService; + /** + * 搜索用户列表数据 + */ + @ApiOperation(value = "搜索用户列表数据") + @RequestMapping(value = "/searchUser", method = RequestMethod.GET) + public Result> searchUser(SysUser user, HttpServletRequest req) { + Result> result = new Result>(); + List resList = new ArrayList<>(); + String username = user.getUsername(); + SysUser userSearch = null; + if(StringUtils.isNotEmpty(username)){ + userSearch = sysUserService.getUserByName(username); + } + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + if(StringUtils.isNotEmpty(username)){ + queryWrapper1.like("username",username); + queryWrapper1.orderByAsc("username"); + } + Page page = new Page<>(1, 20); + IPage pageList = sysUserService.page(page, queryWrapper1); + List userList = pageList.getRecords(); + if(null != userSearch){ + SysUser finalUserSearch = userSearch; + boolean hasUser = userList.stream() + .filter(u -> u.getId().equals(finalUserSearch.getId())) + .findFirst() + .isPresent(); + if(!hasUser){ + resList.add(userSearch); + } + resList.addAll(userList); + } + result.setSuccess(true); + result.setResult(resList); + log.info(userList.toString()); + return result; + } + /** * 获取用户列表数据 * diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 24fdc6166..b3240aa71 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -164,11 +164,11 @@ }, getUserAndDepart(value, callback) { let query = { - current: 1, - pageSize: 20, - username: '*' + value + '*' + // current: 1, + // pageSize: 20, + username: value } - getAction('/sys/user/page', query).then((res) => { + getAction('/sys/user/searchUser', query).then((res) => { if (res.success) { callback && callback(res.result.records || res.result) } else {