From 79a8116dac8e712eb34bd0377fdeafbcdd85fcb9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 12 Jan 2021 14:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=87=AA=E5=8A=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=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        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 64df5855ad..4ee3f577b9 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
@@ -739,6 +739,9 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             ResiTopicEntity resiTopic =  ConvertUtils.sourceToTarget(draft, ResiTopicEntity.class);
             resiTopic.setId(null);
             resiTopic.setStatus(TopicConstant.PUBLISHMENT);
+			resiTopic.setCreatedTime(null);
+			resiTopic.setUpdatedBy(draft.getCreatedBy());
+			resiTopic.setUpdatedTime(null);
             resiTopicDao.insert(resiTopic);
             entity = new TopicDraftEntity();
             entity.setId(formDTO.getTopicDraftId());
@@ -747,11 +750,11 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             //将草稿附件存入附件表
             List<TopicDraftAttachmentDTO> attachmentList = topicDraftAttachmentService.getFileList(formDTO.getTopicDraftId(), null);
             List<ResiTopicAttachmentEntity> topicAttachments = ConvertUtils.sourceToTarget(attachmentList, ResiTopicAttachmentEntity.class);
-            topicAttachments.forEach(item -> {
-                item.setTopicId(resiTopic.getId());
-            });
             topicAttachments.forEach(item -> {
                 item.setId(null);
+                item.setTopicId(resiTopic.getId());
+                item.setCreatedBy(draft.getCreatedBy());
+                item.setUpdatedBy(draft.getCreatedBy());
             });
             resiTopicAttachmentDao.insertBatch(topicAttachments);
             //将音频状态改为approved