修改人员搜索逻辑

2023-09-18 16:29:39 +08:00
parent f2f3a5b7df
commit 5df7920a94
2 changed files with 42 additions and 4 deletions
@@ -118,6 +118,44 @@ public class SysUserController {
    @Autowired
    private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;

+    /**
+     * 搜索用户列表数据
+     */
+    @ApiOperation(value = "搜索用户列表数据")
+    @RequestMapping(value = "/searchUser", method = RequestMethod.GET)
+    public Result<List<SysUser>> searchUser(SysUser user, HttpServletRequest req) {
+        Result<List<SysUser>> result = new Result<List<SysUser>>();
+        List<SysUser> resList = new ArrayList<>();
+        String username = user.getUsername();
+        SysUser userSearch = null;
+        if(StringUtils.isNotEmpty(username)){
+            userSearch = sysUserService.getUserByName(username);
+        }
+        QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
+        if(StringUtils.isNotEmpty(username)){
+            queryWrapper1.like("username",username);
+            queryWrapper1.orderByAsc("username");
+        }
+        Page<SysUser> page = new Page<>(1, 20);
+        IPage<SysUser> pageList = sysUserService.page(page, queryWrapper1);
+        List<SysUser> 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;
+    }
+
    /**
     * 获取用户列表数据
     *
@@ -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 {