/gov/voice/article/detailV2区分内容和附件

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 {
 		/**

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<>();