From efc6748a0b61a4fe5082ee6549e0716a310af561 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 13 Jan 2023 15:44:49 +0800
Subject: [PATCH] /gov/voice/article/detailV2null

---
 .../service/impl/ArticleServiceImpl.java      | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

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 a67a12b852..c355bd1cc9 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
@@ -1742,47 +1742,47 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		PublishedListResultDTO resultDTO = new PublishedListResultDTO();
 		//1.查询文章主表信息
 		List<PublishedListResultDTO> list = baseDao.selectAllArticle(formDTO);
-
-		if (!CollectionUtils.isEmpty(list)) {
-			resultDTO = list.get(NumConstant.ZERO);
-			resultDTO.setTagNameList(StringUtils.isNotBlank(resultDTO.getTags())?Arrays.asList(resultDTO.getTags().split("[|]")):new ArrayList<>());
-			resultDTO.setIsMePublished(resultDTO.getCreatedBy().equals(formDTO.getStaffId())?true:false);
-			//查询文章涉及的发布范围网络Id列表
-			LambdaQueryWrapper<ArticlePublishRangeEntity> tWrapper = new LambdaQueryWrapper<>();
-			tWrapper.eq(ArticlePublishRangeEntity::getArticleId, formDTO.getArticleId());
-			tWrapper.eq(ArticlePublishRangeEntity::getDelFlag, NumConstant.ZERO_STR);
-			//【文章下线的查所有发布范围，文章没下线的只查还没下线的发布范围】
-			if("offline".equals(resultDTO.getStatusFlag())){
-				tWrapper.eq(ArticlePublishRangeEntity::getPublishStatus, "offline");
-			}else {
-				tWrapper.eq(ArticlePublishRangeEntity::getPublishStatus, "published");
-			}
-			List<ArticlePublishRangeEntity> entityList = articlePublishRangeDao.selectList(tWrapper);
-			if (!CollectionUtils.isEmpty(entityList)) {
-				List<String> contentList = entityList.stream().map(ArticlePublishRangeEntity::getGridId).collect(Collectors.toList());
-				resultDTO.setGridIdList(contentList);
-			}
-
-			//查询文章内容
-			LambdaQueryWrapper<ArticleContentEntity> tWrapper1 = new LambdaQueryWrapper<>();
-			tWrapper1.eq(ArticleContentEntity::getArticleId, formDTO.getArticleId());
-			tWrapper1.eq(ArticleContentEntity::getDelFlag, NumConstant.ZERO_STR);
-			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<ArticleTagsEntity> tWrapper2 = new LambdaQueryWrapper<>();
-			tWrapper2.eq(ArticleTagsEntity::getArticleId, formDTO.getArticleId());
-			tWrapper2.eq(ArticleTagsEntity::getDelFlag, NumConstant.ZERO_STR);
-			List<ArticleTagsEntity> tagsEntityList = articleTagsDao.selectList(tWrapper2);
-			if (!CollectionUtils.isEmpty(tagsEntityList)) {
-				List<String> contentList = tagsEntityList.stream().map(ArticleTagsEntity::getTagId).collect(Collectors.toList());
-				resultDTO.setTagIdList(contentList);
-			}
+		if(CollectionUtils.isEmpty(list)){
+			return null;
+		}
+		resultDTO = list.get(NumConstant.ZERO);
+		resultDTO.setTagNameList(StringUtils.isNotBlank(resultDTO.getTags())?Arrays.asList(resultDTO.getTags().split("[|]")):new ArrayList<>());
+		resultDTO.setIsMePublished(resultDTO.getCreatedBy().equals(formDTO.getStaffId())?true:false);
+		//查询文章涉及的发布范围网络Id列表
+		LambdaQueryWrapper<ArticlePublishRangeEntity> tWrapper = new LambdaQueryWrapper<>();
+		tWrapper.eq(ArticlePublishRangeEntity::getArticleId, formDTO.getArticleId());
+		tWrapper.eq(ArticlePublishRangeEntity::getDelFlag, NumConstant.ZERO_STR);
+		//【文章下线的查所有发布范围，文章没下线的只查还没下线的发布范围】
+		if("offline".equals(resultDTO.getStatusFlag())){
+			tWrapper.eq(ArticlePublishRangeEntity::getPublishStatus, "offline");
+		}else {
+			tWrapper.eq(ArticlePublishRangeEntity::getPublishStatus, "published");
+		}
+		List<ArticlePublishRangeEntity> entityList = articlePublishRangeDao.selectList(tWrapper);
+		if (!CollectionUtils.isEmpty(entityList)) {
+			List<String> contentList = entityList.stream().map(ArticlePublishRangeEntity::getGridId).collect(Collectors.toList());
+			resultDTO.setGridIdList(contentList);
+		}
+
+		//查询文章内容
+		LambdaQueryWrapper<ArticleContentEntity> tWrapper1 = new LambdaQueryWrapper<>();
+		tWrapper1.eq(ArticleContentEntity::getArticleId, formDTO.getArticleId());
+		tWrapper1.eq(ArticleContentEntity::getDelFlag, NumConstant.ZERO_STR);
+		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<ArticleTagsEntity> tWrapper2 = new LambdaQueryWrapper<>();
+		tWrapper2.eq(ArticleTagsEntity::getArticleId, formDTO.getArticleId());
+		tWrapper2.eq(ArticleTagsEntity::getDelFlag, NumConstant.ZERO_STR);
+		List<ArticleTagsEntity> tagsEntityList = articleTagsDao.selectList(tWrapper2);
+		if (!CollectionUtils.isEmpty(tagsEntityList)) {
+			List<String> contentList = tagsEntityList.stream().map(ArticleTagsEntity::getTagId).collect(Collectors.toList());
+			resultDTO.setTagIdList(contentList);
 		}
 
 		return resultDTO;