From d99618d4333b241c6a54d36639a2b8f01d2bf0d4 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 6 Apr 2021 14:18:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81=E5=88=B0?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/ProjectServiceImpl.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index bebf4654b5..251e86ec57 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -2181,12 +2181,12 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		IssueDetailFormDTO issueDetailFormDTO = new IssueDetailFormDTO();
 		issueDetailFormDTO.setIssueId(projectEntity.getOriginId());
 		Result<GovIssueDetailResultDTO> issueDetail = govIssueOpenFeignClient.votingissuedetail(issueDetailFormDTO);
-		if (!issueDetail.success()) {
+		if (!issueDetail.success() || null == issueDetail.getData()) {
 			throw new RenException(issueDetail.getCode(), issueDetail.getMsg());
 		}
 		//获取话题详情
 		Result<ResiTopicDTO> topic =  resiGroupOpenFeignClient.getTopicById(issueDetail.getData().getTopicInfo().getTopicId());
-		if (!topic.success()) {
+		if (!topic.success() || null == topic.getData()) {
 			throw new RenException(topic.getCode(), topic.getMsg());
 		}
 		applyAssistFormDTO.setLatitude(topic.getData().getDimension());
@@ -2198,7 +2198,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		TopicAttachmentFormDTO topicAttachmentFormDTO = new TopicAttachmentFormDTO();
 		topicAttachmentFormDTO.setTopicId(issueDetail.getData().getTopicInfo().getTopicId());
 		Result<TopicAttachmentResultDTO> topicAttachment =  resiGroupOpenFeignClient.topicAttachmentList(topicAttachmentFormDTO);
-		if (!topicAttachment.success()) {
+		if (!topicAttachment.success() || null == topicAttachment.getData()) {
 			throw new RenException(topicAttachment.getCode(), topicAttachment.getMsg());
 		}
 		if (CollectionUtils.isNotEmpty(issueDetail.getData().getTopicInfo().getPhotoList())) {