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%"