Merge branch 'dev_voice_share_point' into dev_temp

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)) {
@@ -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())){