From ec6eda693019efb1c73f5e9e18d11af44a6b8914 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 24 Dec 2020 15:42:40 +0800
Subject: [PATCH] =?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

---
 .../group/dto/topic/form/CreateTopicFormDTO.java   |  2 +-
 .../topic/service/impl/TopicDraftServiceImpl.java  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java
index 9369470945..e8daa37b2d 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java
@@ -62,7 +62,7 @@ public class CreateTopicFormDTO implements Serializable {
 	/**
 	 * 图片附件
 	 */
-	private List<FileDTO> imageList;
+	private List<String> imageList;
 	/**
 	 * 文件附件
 	 */
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 098c05e3b1..8077d5933f 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
@@ -279,18 +279,18 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         if(CollectionUtils.isNotEmpty(formDTO.getImageList())){
             TopicDraftAttachmentDTO attachment = new TopicDraftAttachmentDTO();
             int sort = 0;
-            for(FileDTO file : formDTO.getImageList()){
-                attachment.setAttachmentUrl(file.getUrl());
+            for(String url : formDTO.getImageList()){
+                attachment.setAttachmentUrl(url);
                 attachment.setTopicDraftId(topic.getId());
                 attachment.setCreatedBy(tokenDto.getUserId());
-                attachment.setAttachmentFormat(file.getUrl().substring(file.getUrl().lastIndexOf(".") + NumConstant.ONE).toLowerCase());
+                attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
                 attachment.setAttachmentType("image");
                 topicDraftAttachmentService.save(attachment);
 
                 ImgTaskDTO task = new ImgTaskDTO();
                 task.setDataId(attachment.getId());
-                task.setUrl(file.getUrl());
+                task.setUrl(url);
                 imageDTOList.add(task);
             }
         }
@@ -671,11 +671,11 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         if(CollectionUtils.isNotEmpty(formDTO.getImageList())){
             ResiTopicAttachmentEntity attachment = new ResiTopicAttachmentEntity();
             int sort = 0;
-            for(FileDTO file : formDTO.getImageList()){
-                attachment.setAttachmentUrl(file.getUrl());
+            for(String url : formDTO.getImageList()){
+                attachment.setAttachmentUrl(url);
                 attachment.setTopicId(topic.getId());
                 attachment.setCreatedBy(tokenDto.getUserId());
-                attachment.setAttachmentFormat(file.getUrl().substring(file.getUrl().lastIndexOf(".") + NumConstant.ONE).toLowerCase());
+                attachment.setAttachmentFormat(url.substring(url.lastIndexOf(".") + NumConstant.ONE).toLowerCase());
                 attachment.setSort(sort++);
                 attachment.setAttachmentType("image");
                 resiTopicAttachmentDao.insertOne(attachment);