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 getCustomerInfo(CustomerDTO dto) { CustomerEntity entity = baseDao.selectById(dto.getId()); + if (null == entity) { + log.warn(String.format("当前客户id:%s,已删除", dto.getId())); + return new Result(); + } List 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 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());