Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_voice_share_point

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -137,6 +137,7 @@
           RESI_TOPIC_ATTACHMENT attachment
           WHERE
           attachment.DEL_FLAG = '0'
+          AND attachment.ATTACHMENT_TYPE = 'image'
           GROUP BY attachment.TOPIC_ID
         ) attachement2
         ON
@@ -155,7 +156,7 @@
         SELECT
         topic.ID AS topicId,
         topic.GROUP_ID,
-        IFNULL(topic.TOPIC_CONTENT,'语音话题') AS topicContent,
+        topic.TOPIC_CONTENT,
         topic.STATUS,
         topic.CREATED_TIME AS releaseTime,
         topic.CREATED_BY AS userId,
@@ -203,7 +204,7 @@
         SELECT
         topic.ID AS topicId,
         topic.GROUP_ID,
-        IFNULL(topic.TOPIC_CONTENT,'语音话题') AS topicContent,
+        topic.TOPIC_CONTENT,
         topic.STATUS,
         topic.CREATED_TIME AS releaseTime,
         topic.CREATED_BY AS userId,