Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
MeterSphere
Commits
a3f8cf3a
Commit
a3f8cf3a
authored
3 years ago
by
shiziyuan9527
Browse files
Options
Download
Email Patches
Plain Diff
refactor: 用户列表搜索改为按照ID/名称搜索
parent
4add022e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
+2
-1
...ain/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
frontend/src/business/components/settings/system/User.vue
+2
-2
frontend/src/business/components/settings/system/User.vue
with
4 additions
and
3 deletions
+4
-3
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserMapper.xml
+
2
-
1
View file @
a3f8cf3a
...
...
@@ -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},'%')
...
...
This diff is collapsed.
Click to expand it.
frontend/src/business/components/settings/system/User.vue
+
2
-
2
View file @
a3f8cf3a
...
...
@@ -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%"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help