From 49df83826c52a77633ec085934014779017e72f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Sun, 25 Jun 2023 19:09:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/service/impl/HyPartnerLineInfoServiceImpl.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 cebcd5fb9..f6019ce89 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
@@ -429,10 +429,6 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         List<HyPartnerLineInfoDO> lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId);
         //当前加盟商线索
         HyPartnerLineInfoDO HyPartnerLineInfo = hyPartnerLineInfoDAO.getByPartnerId(partnerId);
-        if(HyPartnerLineInfo == null){
-            Boolean lineStatus = getLineStatus(Long.valueOf(wantShopArea), acceptAdjustType);
-            return lineStatus;
-        }
         //如果意向区域没有绑定战区 不分配招商经理
         HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea), "intent");
         if (hyIntendDevelopementMappingDO==null){
@@ -442,6 +438,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         if (HyPartnerLineInfo.getLineStatus()==1||CollectionUtils.isEmpty(lineFollowHistoryList)){
             return Boolean.FALSE;
         }
+        if(HyPartnerLineInfo == null){
+            Boolean lineStatus = getLineStatus(Long.valueOf(wantShopArea), acceptAdjustType);
+            return lineStatus;
+        }
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(partnerId);
         Boolean lineStatus = getLineStatus(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()), hyPartnerUserInfoDO.getAcceptAdjustType());
         return lineStatus;