Merge branch 'zouxuan_saas_2022_0606' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/resources/config/mybatis/ImGroupMemberMapper.xml

@@ -144,7 +144,12 @@
 				AND igm.im_group_id_ = #{imGroupId}
 			</if>
 			<if test="roleType != null and roleType != ''">
-				AND igm.role_type_ = #{roleType}
+				<if test="roleType == '学员'">
+					AND (igm.role_type_ IS NULL OR igm.role_type_ = '')
+				</if>
+				<if test="roleType != '学员'">
+					AND igm.role_type_ = #{roleType}
+				</if>
 			</if>
 			<if test="search != null and search != ''">
 				AND (igm.nickname_ LIKE CONCAT('%',#{search},'%') OR igm.user_id_ = #{search} OR u.phone_ LIKE CONCAT('%',#{search},'%'))