From 71fe7cacd7208901a9bec8289ce2ef2ecbd25b45 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Sep 2021 09:53:32 +0800
Subject: [PATCH] =?UTF-8?q?/oper/crm/customer/getcostomerInfo=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=AE=A2=E6=88=B7=E5=B7=B2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E4=B8=8D=E8=A6=81=E6=8A=A5=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=87=E9=92=88=EF=BC=8Cuser=E3=80=81crm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/CustomerServiceImpl.java | 4 ++++
 .../java/com/epmet/service/impl/UserAdviceServiceImpl.java    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
index f66c547f6c..3b31e4feac 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@@ -215,6 +215,10 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
     @Override
     public Result<CustomerDTO> getCustomerInfo(CustomerDTO dto) {
         CustomerEntity entity = baseDao.selectById(dto.getId());
+        if (null == entity) {
+            log.warn(String.format("当前客户id：%s,已删除", dto.getId()));
+            return new Result();
+        }
         List<String> customerIds=customerRelationService.getAllSubCustomerIds(dto.getId());
         CustomerDTO customerDTO=ConvertUtils.sourceToTarget(entity, CustomerDTO.class);
         if(CollectionUtils.isEmpty(customerIds)){
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
index bdf908849f..3f189b5426 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java
@@ -334,7 +334,7 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         CustomerDTO customerDTO = new CustomerDTO();
         customerDTO.setId(dto.getCustomerId());
         Result<CustomerDTO> customerInfo = operCrmOpenFeignClient.getCustomerInfo(customerDTO);
-        if (customerInfo.success()){
+        if (customerInfo.success() && null != customerInfo.getData()) {
             userAdviceDTO.setCustomerName(customerInfo.getData().getCustomerName());
         }else {
             logger.error("customerId:{},获取customerName失败",dto.getCustomerId());