From 5323ce3a50a0cb886571138b8ea4c5ef8692ef15 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 8 Jan 2021 17:18:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=A1=AB=E5=85=85?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E8=AF=9D=E9=A2=98=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/topic/ResiTopicDao.xml         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
index fb1ac3a82c..8f21ba60b3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
+++ b/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,

From 229002c1ad2dc66d5aff05cffa811a6190e8dcff Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 8 Jan 2021 17:20:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/topic/service/impl/TopicDraftServiceImpl.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index 7e9cba4229..2ee3045407 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -803,6 +803,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         Date currentTime = new Date();
         //2.创建话题
         ResiTopicEntity topic = ConvertUtils.sourceToTarget(formDTO,ResiTopicEntity.class);
+        if (CollectionUtils.isNotEmpty(formDTO.getVoiceList()) && StringUtils.isBlank(formDTO.getTopicContent())) {
+            topic.setTopicContent("语音话题");
+        }
         topic.setCreatedBy(tokenDto.getUserId());
         topic.setStatus(TopicConstant.PUBLISHMENT);
         resiTopicDao.insertOne(topic);