Merge remote-tracking branch 'origin/dev_thirdplatform' into dev_temp

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -2231,12 +2231,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());
@@ -2248,7 +2248,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())) {