Merge branch 'feature/xgh/bug/0227' into 'master'

bug

See merge request !2502

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatUserMapper.xml

@@ -338,8 +338,9 @@
 	</select>
 
 	<select id="isAddGroupChat" resultType="int">
-		select count(*) from tab_haoban_group_chat_user where enterprise_id = #{enterpriseId}
-		and member_id = #{memberId} and status_flag = 1  and delete_flag = 0
+		select count(*) from tab_haoban_group_chat_user a left join tab_haoban_group_chat b on a.group_chat_id = b.group_chat_id  where a.enterprise_id = #{enterpriseId}
+		and a.member_id = #{memberId} and a.status_flag = 1  and a.delete_flag = 0
+		and b.delete_flag = 0 and b.chat_status != 4
 	</select>
 
     <select id="listMemberChatHmIdByChatHmIdsAndMemberId"