From 3f77e97de36b6623a1f23f4707e0bfb9f53b43e8 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Fri, 8 Jan 2021 17:15:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=AD=E9=9F=B3=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=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

---
 .../topic/service/impl/TopicDraftServiceImpl.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 af82f7dfe0..7e9cba4229 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
@@ -318,7 +318,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                             //草稿状态更新为block
                             TopicDraftEntity draftEntity = new TopicDraftEntity();
                             draftEntity.setId(draftId);
-                            draftEntity.setDraftStatus(TopicConstant.REVIEW);
+                            draftEntity.setDraftStatus(TopicConstant.BLOCK);
                             draftEntity.setDraftReason("语音存在违规内容");
                             baseDao.updateById(draftEntity);
 
@@ -326,7 +326,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                             //草稿状态更新为review
                             TopicDraftEntity draftEntity = new TopicDraftEntity();
                             draftEntity.setId(draftId);
-                            draftEntity.setDraftStatus(TopicConstant.BLOCK);
+                            draftEntity.setDraftStatus(TopicConstant.REVIEW);
                             draftEntity.setDraftReason("需要人工审核");
                             baseDao.updateById(draftEntity);
 
@@ -370,6 +370,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         }
 
         TopicDraftEntity topic = ConvertUtils.sourceToTarget(formDTO,TopicDraftEntity.class);
+        if (CollectionUtils.isNotEmpty(formDTO.getVoiceList()) && StringUtils.isBlank(formDTO.getTopicContent())) {
+            topic.setTopicContent("语音话题");
+        }
         topic.setCreatedBy(tokenDto.getUserId());
         topic.setDraftStatus(TopicConstant.AUDITING);
         topic.setIsSee(NumConstant.ZERO_STR);
@@ -635,10 +638,6 @@ 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())){
@@ -768,7 +767,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
                 breviary.append("\"");
                 breviary.append(content.length() > NumConstant.TEN ?  (content.substring(NumConstant.TEN) + "…") : content);
                 breviary.append("\"");
-            }else breviary.append("话题");
+            }else {
+                breviary.append("话题");
+            }
             sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString());
         }
         //记录操作记录