From 5df7920a9441e8c0746f716062ee4aecaf7969eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 18 Sep 2023 16:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  | 38 +++++++++++++++++++
 .../components/PersonnelSelection/index.vue   |  8 ++--
 2 files changed, 42 insertions(+), 4 deletions(-)

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<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;
+    }
+
     /**
      * 获取用户列表数据
      *
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 {