From 5c933863b4f4b639f781b6ff2e3222e8cace0487 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 Apr 2023 15:14:05 +0800
Subject: [PATCH] =?UTF-8?q?/gov/voice/article/detailV2=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=92=8C=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/PublishedListResultDTO.java  |  5 +++++
 .../com/epmet/service/impl/ArticleServiceImpl.java    | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java
index c776b6c943..0e25e4fd03 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java
@@ -117,6 +117,11 @@ public class PublishedListResultDTO implements Serializable {
 	 */
 	private List<Content> contentList;
 
+	/**
+	 * 附件列表
+	 */
+	private List<Content> fileList;
+
 	@Data
 	public static class Content {
 		/**
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index 0d8e015696..ab7bd3a92f 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -1821,12 +1821,23 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		LambdaQueryWrapper<ArticleContentEntity> tWrapper1 = new LambdaQueryWrapper<>();
 		tWrapper1.eq(ArticleContentEntity::getArticleId, formDTO.getArticleId());
 		tWrapper1.eq(ArticleContentEntity::getDelFlag, NumConstant.ZERO_STR);
+		tWrapper1.ne(ArticleContentEntity::getContentType,"file");
 		tWrapper1.orderByDesc(ArticleContentEntity::getOrderNum);
 		List<ArticleContentEntity> contentEntityList = articleContentDao.selectList(tWrapper1);
 		if (!CollectionUtils.isEmpty(contentEntityList)) {
 			List<PublishedListResultDTO.Content> contentList = ConvertUtils.sourceToTarget(contentEntityList, PublishedListResultDTO.Content.class);
 			resultDTO.setContentList(contentList);
 		}
+		LambdaQueryWrapper<ArticleContentEntity> fileWrapper = new LambdaQueryWrapper<>();
+		fileWrapper.eq(ArticleContentEntity::getArticleId, formDTO.getArticleId());
+		fileWrapper.eq(ArticleContentEntity::getDelFlag, NumConstant.ZERO_STR);
+		fileWrapper.eq(ArticleContentEntity::getContentType,"file");
+		fileWrapper.orderByDesc(ArticleContentEntity::getOrderNum);
+		List<ArticleContentEntity> fileContentEntityList = articleContentDao.selectList(fileWrapper);
+		if (!CollectionUtils.isEmpty(fileContentEntityList)) {
+			List<PublishedListResultDTO.Content> fileList = ConvertUtils.sourceToTarget(fileContentEntityList, PublishedListResultDTO.Content.class);
+			resultDTO.setFileList(fileList);
+		}
 
 		//标签列表
 		LambdaQueryWrapper<ArticleTagsEntity> tWrapper2 = new LambdaQueryWrapper<>();