Merge remote-tracking branch 'origin/dev_guidance' into develop

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)){

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());