From 61eca4df096324cf9c37559367b771ade64aa94c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 3 Mar 2021 19:03:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datareport/service/project/impl/ProjectServiceImpl.java    | 3 ++-
 .../main/java/com/epmet/service/impl/ProjectServiceImpl.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
index e7ccd80f26..f095fb0666 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
@@ -211,7 +211,8 @@ public class ProjectServiceImpl implements ProjectService {
         ProjectDetailResultDTO projectDetailResultDTO=new ProjectDetailResultDTO();
         Result<ProjectInfoDTO> result=govProjectOpenFeignClient.queryProjectInfoByProjectId(processListFormDTO.getProjectId());
         if(!result.success()||null==result.getData()){
-            throw new RenException(String.format("项目信息查询失败(该接口目前只支持e事通内的客户),projectId:%s", processListFormDTO.getProjectId()));
+            log.warn(String.format("项目信息查询失败(该接口目前只支持e事通内的客户),projectId:%s", processListFormDTO.getProjectId()));
+            return projectDetailResultDTO;
         }
         ProjectInfoDTO projectInfoDTO=result.getData();
         projectDetailResultDTO.setImgUrlList(projectInfoDTO.getImgUrlList());
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 2fb4b5f45c..309377bb4b 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
@@ -1928,7 +1928,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	@Override
 	public ProjectInfoDTO queryProjectInfoByProjectId(String projectId) {
 		ProjectInfoDTO projectInfoDTO=baseDao.queryProjectInfoByProjectId(projectId);
-		if(StringUtils.isNotBlank(projectInfoDTO.getIssueId())){
+		if (null != projectInfoDTO && StringUtils.isNotBlank(projectInfoDTO.getIssueId())) {
 			IssueDetailFormDTO formDTO=new IssueDetailFormDTO();
 			formDTO.setIssueId(projectInfoDTO.getIssueId());
 			Result<IssueResultDTO> issueDTOResult=govIssueOpenFeignClient.queryIssueDetail(formDTO);