Commit 55bd24d6 authored by yanghao's avatar yanghao

fix: 修复捞取公海池客户时其订单的salesmanId为空导致空指针异常的bug

parent 75d16855
...@@ -2720,7 +2720,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper, ...@@ -2720,7 +2720,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper,
List<CustomerOrderBackPageVO> orderList = customerMapper.orderList(0, 10, new CustomerOrderQueryDTO().setCustomerId(customerId)); List<CustomerOrderBackPageVO> orderList = customerMapper.orderList(0, 10, new CustomerOrderQueryDTO().setCustomerId(customerId));
if (CollectionUtil.isNotEmpty(orderList) && orderList.size() > 0) {//客户成交的订单不为空 if (CollectionUtil.isNotEmpty(orderList) && orderList.size() > 0) {//客户成交的订单不为空
CustomerOrderBackPageVO orderBackPageVO = orderList.get(0); CustomerOrderBackPageVO orderBackPageVO = orderList.get(0);
if (loginUserId.equals(customer.getCustomerService()) && orderBackPageVO != null && orderBackPageVO.getSalesmanId().equals(loginUserId)) {//订单的客户经理和当前是同一个 if (loginUserId.equals(customer.getCustomerService()) && orderBackPageVO != null && loginUserId.equals(orderBackPageVO.getSalesmanId())) {//订单的客户经理和当前是同一个
estimateEnterOpenSeaTime = isFcl ? null : DateUtil.offsetMonth(now, 6).toJdkDate();//改为6个月 estimateEnterOpenSeaTime = isFcl ? null : DateUtil.offsetMonth(now, 6).toJdkDate();//改为6个月
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment