admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-07 17:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Member fix

Browse Source 
GROUP / ROLE Member FIX
This commit is contained in:
Crystal.Sea 2020-12-12 22:36:23 +08:00
parent b4b0f74a9e
commit 4dafe58d57
4 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml
View File

@ -108,6 +108,12 @@
<if test="groupName != null and groupName != ''">
AND G.NAME = #{groupName}
</if>
<if test="username != null and username != ''">
AND U.USERNAME = #{username}
</if>
<if test="displayName != null and displayName != ''">
AND U.DISPLAYNAME LIKE '%${displayName}%'
</if>
AND GM.TYPE IN( 'USER','USER-DYNAMIC')
AND GM.GROUPID = G.ID
AND GM.MEMBERID = U.ID
@ -170,6 +176,12 @@
AND GM.TYPE IN( 'USER','USER-DYNAMIC')
AND GM.GROUPID = G.ID
)
<if test="username != null and username != ''">
AND U.USERNAME = #{username}
</if>
<if test="displayName != null and displayName != ''">
AND U.DISPLAYNAME LIKE '%${displayName}%'
</if>
</select>

13
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml
View File

@ -108,6 +108,12 @@
<if test="roleName != null and roleName != ''">
AND R.NAME = #{roleName}
</if>
<if test="username != null and username != ''">
AND U.USERNAME = #{username}
</if>
<if test="displayName != null and displayName != ''">
AND U.DISPLAYNAME LIKE '%${displayName}%'
</if>
AND RM.TYPE IN( 'USER','USER-DYNAMIC')
AND RM.ROLEID = R.ID
AND RM.MEMBERID = U.ID
@ -167,9 +173,16 @@
<if test="roleName != null and roleName != ''">
AND R.NAME = #{roleName}
</if>
AND RM.TYPE IN( 'USER','USER-DYNAMIC')
AND RM.ROLEID = R.ID
)
<if test="username != null and username != ''">
AND U.USERNAME = #{username}
</if>
<if test="displayName != null and displayName != ''">
AND U.DISPLAYNAME LIKE '%${displayName}%'
</if>
</select>

2
maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl
View File

@ -54,7 +54,7 @@
<td width="120px"><@locale code="userinfo.username"/>:</td>
<td width="374px">
<form id="basic_search_form">
<input class="form-control" type="text" name="name" style ="width:150px;float:left;">
<input class="form-control" type="text" name="username" style ="width:150px;float:left;">
<input class="button btn btn-primary mr-3" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
</form>
</td>

2
maxkey-web-manage/src/main/resources/templates/views/roleusers/addRoleUsersList.ftl
View File

@ -54,7 +54,7 @@
<td width="120px"><@locale code="userinfo.username"/>:</td>
<td width="374px">
<form id="basic_search_form">
<input class="form-control" type="text" name="name" style ="width:150px;float:left;">
<input class="form-control" type="text" name="username" style ="width:150px;float:left;">
<input class="button btn btn-primary mr-3" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
</form>
</td>