diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 83af302eb0..299c7122da 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -564,7 +564,7 @@ IFNULL(ta.ATTACHMENT_URL,'') AS firstPhoto, false AS isExpirat FROM resi_topic t - LEFT JOIN resi_topic_attachment ta ON ta.TOPIC_ID = t.ID AND ta.ATTACHMENT_TYPE = 'image' AND ta.SORT = 0 + LEFT JOIN resi_topic_attachment ta ON ta.TOPIC_ID = t.ID AND ta.ATTACHMENT_TYPE = 'image' AND ta.DEL_FLAG = '0' AND ta.SORT = 0 WHERE t.DEL_FLAG = '0' AND t.`STATUS` != 'hidden' AND t.GROUP_ID = #{groupId} @@ -582,8 +582,8 @@ IFNULL(ac2.CONTENT,'') AS firstPhoto, false AS isExpirat FROM group_act_info ai - LEFT JOIN group_act_content ac ON ac.GROUP_ACT_ID = ai.ID AND ac.CONTENT_TYPE = 'text' - LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.SORT = 1 + LEFT JOIN group_act_content ac ON ac.GROUP_ACT_ID = ai.ID AND ac.CONTENT_TYPE = 'text' AND ac.DEL_FLAG = 0 AND ac.sort = 1 + LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.DEL_FLAG = 0 AND ac2.SORT = 1 WHERE ai.DEL_FLAG = '0' AND ai.GROUP_ID = #{groupId} ORDER BY ai.CREATED_TIME DESC