Merge branch 'feature/社群' into 'developer'

活码

See merge request !749

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

@@ -82,7 +82,7 @@
 	<select id="listByChatHmIdIncludeOff" resultMap="result-map-tabHaobanGroupChatHmRelation">
 		select
 		<include refid="Base_Column_List" />
-		from tab_haoban_group_chat_hm_relation  where chat_hm_id = #{chatHmId} and ((delete_flag = 0 and status_flag = 1) or (status_flag = 0 and delete_flag = 1)) 
+		from tab_haoban_group_chat_hm_relation  where chat_hm_id = #{chatHmId} and ((delete_flag = 0 and status_flag = 1) or (status_flag = 2 and delete_flag = 1)) 
 	</select>
 	
 	<select id="listChatHmId" resultType="long">