diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 092bc17dd..78fd0bf0b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -433,6 +433,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { Boolean lineStatus = getLineStatus(Long.valueOf(wantShopArea), acceptAdjustType); return lineStatus; } + //如果意向区域没有绑定战区 不分配招商经理 + HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea), "intent"); + if (hyIntendDevelopementMappingDO==null){ + return Boolean.FALSE; + } //如果是私海线索 不需要重新分配招商经理 或者跟进次数大于1 if (HyPartnerLineInfo.getLineStatus()==1||CollectionUtils.isEmpty(lineFollowHistoryList)){ return Boolean.FALSE; @@ -487,11 +492,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { //意向区域 String wantShopArea = hyPartnerUserInfoDO.getWantShopArea(); EnterpriseUserDO enterpriseUserDO = new EnterpriseUserDO(); - // TODO: 2023/6/21 如果意向区域没有绑定战区 分配给谁 - //查询意向区域绑定的组织架构 + //查询意向区域绑定的组织架构 没有绑定战区 分配空 HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea),type); if (hyIntendDevelopementMappingDO==null){ - throw new ServiceException(ErrorCodeEnum.INTENT_AREA_NOT_BING_ZONE); + return ""; } List result = new ArrayList<>(); if (hyIntendDevelopementMappingDO!=null){