diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
index ff26d13a7..13f82e519 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java
@@ -133,7 +133,7 @@ public interface HyPartnerLineInfoService {
      * @param lineId
      * @return
      */
-    Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType);
+    Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean flag );
 
     /**
      * 线索状态
@@ -159,7 +159,7 @@ public interface HyPartnerLineInfoService {
      * @param acceptAdjustType
      * @return
      */
-    HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType);
+    HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean assignFlag);
 
     Long checkGenerateNewLineId(Long lineId);
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
index 90dbec20a..aaa31408f 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
@@ -125,7 +125,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         hyPartnerBaseInfoDAO.updateByPartnerId(baseUserInfoRequest.getUsername(),baseUserInfoRequest.getMobile(),baseUserInfoRequest.getPartnerId());
 
         // 更新线索状态
-        HyPartnerLineInfoDO hyPartnerLineInfoDO =  hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), baseUserInfoRequest.getWantShopArea(), baseUserInfoRequest.getAcceptAdjustType());
+        HyPartnerLineInfoDO hyPartnerLineInfoDO =  hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), baseUserInfoRequest.getWantShopArea(), baseUserInfoRequest.getAcceptAdjustType(),Boolean.TRUE);
 
         //更新意向申请表中信息
         HyPartnerIntentInfoDO hyPartnerIntentInfoDO = hyPartnerIntentInfoDAO.selectByLineId(hyPartnerLineInfoDO.getId());
@@ -221,7 +221,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         // 更新线索状态和招商经理
         //是公海线索 才会修改线索状态与招商经理
         if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){
-            Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType());
+            Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType(),Boolean.TRUE);
             hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
             if (flag){
                 String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(request.getPartnerId(), "intent");
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 4db2c9c34..3232ca86b 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
@@ -568,9 +568,12 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
     }
 
     @Override
-    public Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType) {
+    public Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean flag) {
         log.info("assignFollowUser partnerId:{}，wantShopArea：{}，acceptAdjustType：{}",partnerId,wantShopArea,acceptAdjustType);
 
+        if (!flag){
+            return Boolean.FALSE;
+        }
         List<HyPartnerLineInfoDO> lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId);
         //如果跟进次数大于1 直接使用上一次的招商经理
         if (CollectionUtils.isNotEmpty(lineFollowHistoryList)){
@@ -710,10 +713,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         return null;
     }
     @Override
-    public HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType) {
+    public HyPartnerLineInfoDO generateDefaultLineInfo(String partnerId, String wantShopArea, Integer acceptAdjustType,Boolean assignFlag) {
         // 生成一条线索
         HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(partnerId);
-        Boolean flag = this.assignFollowUser(partnerId, wantShopArea, acceptAdjustType);
+        Boolean flag = this.assignFollowUser(partnerId, wantShopArea, acceptAdjustType,assignFlag);
         String investmentManager = null;
         if (flag){
             investmentManager = getAssignFollowUser(partnerId, "intent");
@@ -752,8 +755,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             //将老的线索置为删除状态
             hyPartnerLineInfoDAO.batchDeleted(Collections.singletonList(hyPartnerLineInfoDO.getId()));
             HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId());
-            // 生成一条新线索
-            HyPartnerLineInfoDO newLineInfoDO =  this.generateDefaultLineInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType());
+            // 生成一条新线索 生成新线索的时候不需要公海到私海
+            HyPartnerLineInfoDO newLineInfoDO =  this.generateDefaultLineInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType(),Boolean.FALSE);
             // 生成一条意向基本信息
             HyPartnerBaseInfoDO oldBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(hyPartnerUserInfoDO.getPartnerId(), lineId);
             hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, newLineInfoDO.getId(), oldBaseInfoDO.getUserPortrait());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java
index 2dd6652fe..23eb1dea2 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java
@@ -108,7 +108,7 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
         fillUserInfoDOByRequest(hyPartnerUserInfoDO, partnerUserInfoRequest);
         hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);
         // 生成一条线索
-        HyPartnerLineInfoDO hyPartnerLineInfoDO =  hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), partnerUserInfoRequest.getWantShopArea(), partnerUserInfoRequest.getAcceptAdjustType());
+        HyPartnerLineInfoDO hyPartnerLineInfoDO =  hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), partnerUserInfoRequest.getWantShopArea(), partnerUserInfoRequest.getAcceptAdjustType(),Boolean.TRUE);
         // 生成一条意向基本信息
         hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, hyPartnerLineInfoDO.getId(), null);
         HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerUserInfoRequest.getWantShopArea()));
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
index bf4ab11c4..0ee748b7e 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
@@ -294,7 +294,7 @@ public class DeskController {
     public ResponseResult<Boolean> getFollowHistory(@RequestParam(value = "partnerId",required = false)String partnerId,
                                                    @RequestParam(value = "wantShopArea",required = false)String wantShopArea,
                                                    @RequestParam(value = "acceptAdjustType",required = false)Integer acceptAdjustType){
-        return ResponseResult.success(hyPartnerLineInfoService.assignFollowUser(partnerId,wantShopArea,acceptAdjustType));
+        return ResponseResult.success(hyPartnerLineInfoService.assignFollowUser(partnerId,wantShopArea,acceptAdjustType,Boolean.TRUE));
     }