From 581c44857828d829b5e4cba032305ad058b2bf14 Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Wed, 21 Apr 2021 11:04:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E6=96=B0=E8=AF=84?=
 =?UTF-8?q?=E5=AE=A1=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AFbug=20=E8=AF=A2?=
 =?UTF-8?q?=E4=BB=B7=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E4=BC=81=E4=B8=9A=E6=94=BE=E5=85=A5=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectrecord/service/impl/ProjectRecordServiceImpl.java  | 4 +++-
 .../service/impl/ProjectReEvaluationServiceImpl.java          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
index 75b0326..b7c60a1 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
@@ -881,8 +881,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
         record.setProjectName(projectEntrust.getProjectName());
         //项目组织形式
         record.setBidOrgDict(projectEntrust.getOrganization());
-        //采购人(采购人组织机构)
+        //采购人(采购人组织机构) 询价单位名称(例如山东省济南市分公司)
         record.setTendereeOrgName(projectEntrust.getPurchaser());
+        //所属部门  询价企业名称（中国联合网络通信有限公司）
+        record.setTendereeName(inquiryVO.getInquiryCompany());
         //所属省分
         record.setProvince(inquiryVO.getOrgOu());
         //采购经理
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
index a359def..6a09bf1 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
@@ -189,7 +189,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
             log.info("重评校验子项目信息返回结果：{}",JsonUtils.objectToJson(baseResponse));
             CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
             ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_CHECK_STATUS_ERROR.customValid(!baseResponse.getData());
-        }catch (Exception e){
+        }catch (NullPointerException e){
             ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_CHECK_STATUS_ERROR.throwException();
         }