From 1cd400a1ce500f9b3a042df0a1e1d7a0bfdddab9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 8 Jan 2021 16:25:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 61a490f58c..b1cd5d88e5 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
@@ -319,7 +319,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                             TopicDraftEntity draftEntity = new TopicDraftEntity();
                             draftEntity.setId(draftId);
                             draftEntity.setDraftStatus(TopicConstant.REVIEW);
-                            draftEntity.setDraftReason("需要人工审核");
+                            draftEntity.setDraftReason("语音存在违规内容");
                             baseDao.updateById(draftEntity);
 
                         } else if(TopicConstant.REVIEW.equals(status)) {
@@ -327,7 +327,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                             TopicDraftEntity draftEntity = new TopicDraftEntity();
                             draftEntity.setId(draftId);
                             draftEntity.setDraftStatus(TopicConstant.BLOCK);
-                            draftEntity.setDraftReason("语音存在违规内容");
+                            draftEntity.setDraftReason("需要人工审核");
                             baseDao.updateById(draftEntity);
 
                         } else if(TopicConstant.AUTO_PASSED.equals(status)) {

From 33dc826ce4960711f004ac3033e7641120bfe239 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 8 Jan 2021 16:33:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/topic/service/impl/TopicDraftServiceImpl.java     | 4 ++++
 1 file changed, 4 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 b1cd5d88e5..af82f7dfe0 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
@@ -635,6 +635,10 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             result = baseDao.selectTopicDraftByGroup(formDTO.getGroupId(), formDTO.getStatus());
         }
         result.forEach(item -> {
+            List<TopicDraftAttachmentDTO>  list = topicDraftAttachmentService.getFileList(item.getTopicDraftId(), TopicConstant.VOICE);
+            if (CollectionUtils.isNotEmpty(list) && StringUtils.isBlank(item.getTopicContent())) {
+                item.setTopicContent("语音话题");
+            }
             ResiGroupMemberInfoRedisDTO memberRedis =
                     resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName());
             if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){