diff --git a/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewZeroExtendVO.java b/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewZeroExtendVO.java index cd6e5dd..e16e533 100644 --- a/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewZeroExtendVO.java +++ b/src/main/java/com/kiisoo/ic/customer/entity/CustomerViewZeroExtendVO.java @@ -33,6 +33,7 @@ public class CustomerViewZeroExtendVO { private Long companyId; private String company; /**客户*/ + private Long customerId; private String customer; /**推广数*/ private Integer numb; diff --git a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java index 3233c82..5df0f32 100644 --- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java +++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java @@ -370,6 +370,9 @@ public class CustomerViewService { * @param shopList 店铺list */ public void getShopRegionInfo(List shopList){ + if(shopList.size() == 0){ + return; + } //零售公司信息 List orgIds = shopList.stream().map(CustomerViewZeroExtendVO::getParentId).collect(Collectors.toList()); if(orgIds.size() == 0){ diff --git a/src/main/resources/mapper/OpCustomerDOMapper.xml b/src/main/resources/mapper/OpCustomerDOMapper.xml index 3d2a3b3..90507c5 100644 --- a/src/main/resources/mapper/OpCustomerDOMapper.xml +++ b/src/main/resources/mapper/OpCustomerDOMapper.xml @@ -115,7 +115,7 @@