Merge branch 'zx_saas_imGroup' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -213,7 +213,7 @@
 		</foreach>
 	</update>
 	<update id="batchUpdateGroupMemberRole">
-		UPDATE im_group_member SET group_role_Type_ = #{groupRoleType} WHERE im_group_id_ = #{groupId} and user_id_ IN
+		UPDATE im_group_member SET group_role_Type_ = #{groupRoleType},init_flag_ = 1 WHERE im_group_id_ = #{groupId} and user_id_ IN
 		<foreach collection="userIds" item="item" open="(" separator="," close=")">
 			#{item}
 		</foreach>
@@ -230,7 +230,8 @@
         </foreach>
     </select>
     <select id="groupRoleInit" resultType="com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper$GroupMemberRole1">
-		select im_group_id_ groupId,group_role_type_ groupRoleType,user_id_ userId from im_group_member where group_role_type_ = #{groupRoleType} order by id_ DESC
+		select im_group_id_ groupId,group_role_type_ groupRoleType,user_id_ userId from im_group_member
+		where group_role_type_ = #{groupRoleType} AND init_flag_ = 0 order by id_ DESC
 	</select>
 
     <delete id="delByImGroupAndUserId">