Member fix

GROUP / ROLE Member FIX

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>
 	
 	

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>
 	
 	

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>

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>