Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

2023-06-25 19:23:48 +08:00
parent 6a8b3df31a 414b99e132
commit 7192852d64
1 changed files with 1 additions and 1 deletions
--- 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
@@ -435,7 +435,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
            return Boolean.FALSE;
        }
        //如果是私海线索 不需要重新分配招商经理  或者跟进次数大于1
-        if (HyPartnerLineInfo.getLineStatus()==1||CollectionUtils.isEmpty(lineFollowHistoryList)){
+        if ((HyPartnerLineInfo != null && HyPartnerLineInfo.getLineStatus()==1) || CollectionUtils.isEmpty(lineFollowHistoryList)){
            return Boolean.FALSE;
        }
        if(HyPartnerLineInfo == null){