From 0c9298a6044b4bb5eb91d5c29fdff18d75e352f2 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 4 Aug 2021 17:56:54 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=90=9C=E7=B4=A2=E6=94=B9=E4=B8=BA=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?ID/=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/base/mapper/ext/ExtUserMapper.xml     | 3 ++-
 frontend/src/business/components/settings/system/User.vue     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
index 63ee4a1482..11df7fcd91 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
@@ -46,7 +46,8 @@
                 AND u.id like CONCAT('%', #{userRequest.id},'%')
             </if>
             <if test="userRequest.name != null">
-                AND u.name like CONCAT('%', #{userRequest.name},'%')
+                AND (u.name like CONCAT('%', #{userRequest.name},'%')
+                        or u.id like CONCAT('%', #{userRequest.name},'%'))
             </if>
             <if test="userRequest.email != null">
                 AND u.email like CONCAT('%', #{userRequest.email},'%')
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 29376bcbb1..76afde6994 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -5,8 +5,8 @@
       <template v-slot:header>
         <ms-table-header :create-permission="['SYSTEM_USER:READ+CREATE']" :condition.sync="condition" @search="search"
                          @import="importUserDialogOpen" :show-import="true" :import-tip="$t('commons.import_user')"
-                         @create="create" :create-tip="$t('user.create')" :title="$t('commons.user')"/>
-
+                         :tip="$t('commons.search_by_name_or_id')" @create="create"
+                         :create-tip="$t('user.create')" :title="$t('commons.user')"/>
       </template>
 
       <el-table border class="adjust-table ms-select-all-fixed" :data="tableData" style="width: 100%"