From 4dafe58d5774aa08c7e579000876de37be1f13cc Mon Sep 17 00:00:00 2001
From: "Crystal.Sea" <shimingxy@163.com>
Date: Sat, 12 Dec 2020 22:36:23 +0800
Subject: [PATCH] Member fix

GROUP / ROLE Member FIX
---
 .../mapper/xml/mysql/GroupMemberMapper.xml          | 12 ++++++++++++
 .../mapper/xml/mysql/RoleMemberMapper.xml           | 13 +++++++++++++
 .../templates/views/groupuser/addGroupUsersList.ftl |  2 +-
 .../templates/views/roleusers/addRoleUsersList.ftl  |  2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml
index 5b9c5bfe..be2727dd 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml
@@ -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>
 	
 	
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml
index 97b37d25..af8864f0 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml
@@ -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>
 	
 	
diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl
index 010a2bb1..068a2aaa 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl
@@ -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>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/roleusers/addRoleUsersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/roleusers/addRoleUsersList.ftl
index aa465701..1549a71e 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/roleusers/addRoleUsersList.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/roleusers/addRoleUsersList.ftl
@@ -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>