From bf1432316da246a694af2ab143b31f3489aa74e6 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: Tue, 16 Apr 2024 17:11:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=AE=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/LineInfoMapper.xml          | 8 ++++++--
 .../java/com/cool/store/service/impl/LineServiceImpl.java | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
index 806624594..84673f37b 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
@@ -359,7 +359,9 @@
 
   <select id="lineList" resultMap="BaseResultMap">
     select * from xfsg_line_info a
-    left join xfsg_open_area_info b on a.want_shop_area_id = b.id
+    <if test="wantShopAreaName!=null">
+      left join xfsg_open_area_info b on a.want_shop_area_id = b.id
+    </if>
     where  a.deleted = 0 and a.line_status = 1 and a.join_status = 0
     <if test="userId != null and userId != ''">
       and a.investment_manager = #{userId}
@@ -401,7 +403,9 @@
 
   <select id="partnerList" resultMap="BaseResultMap">
     select * from xfsg_line_info a
-    left join xfsg_open_area_info b on a.want_shop_area_id = b.id
+    <if test="wantShopAreaName != null">
+      left join xfsg_open_area_info b on a.want_shop_area_id = b.id
+    </if>
     where  a.deleted = 0 and a.line_status = 1 and a.join_status in (1,2)
     <if test="userId != null and userId != ''">
       and a.investment_manager = #{userId}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
index 882536bbc..852a45c2c 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
@@ -277,16 +277,19 @@ public class LineServiceImpl implements LineService {
         if (lineInfo==null){
             throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
         }
+        //分配拦截 分配的时候在公海才能分配      转让不拦截
         if (!lineInfo.getLineStatus().equals(LineStatusEnum.PUBLIC_SEAS.getCode())&&!transferFlag){
             throw new ServiceException(ErrorCodeEnum.NOT_IN_PUBLIC_SEA);
         }
-        if (lineInfo.getInvestmentManager().equals(changeInvestmentRequest.getInvestmentManagerId())){
+        //转让的时候拦截  且不能转让给自己
+        if (lineInfo.getInvestmentManager().equals(changeInvestmentRequest.getInvestmentManagerId())&&transferFlag){
             throw new ServiceException(ErrorCodeEnum.NO_TRANSFER_REQUIRED);
         }
 
         //如果线索招商经理为空 直接分配  如果不为空 且线索在公海 说明线索被结束 需要重置ID 生成一条新的线索
         lineInfo.setLineStatus(LineStatusEnum.PRIVATE_SEAS.getCode());
         lineInfo.setInvestmentManager(changeInvestmentRequest.getInvestmentManagerId());
+        lineInfo.setUpdateUserId(userInfo.getUserId());
         lineInfoDAO.updateLineInfo(lineInfo);
         if (transferFlag){
             //添加日志