From d9d7431b50f6251bd53162283e1d7cbe91c87462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?=
 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Date: Wed, 4 Feb 2026 11:39:40 +0000
Subject: [PATCH] Merge #41 into master from cc_20251208_visit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix:过滤未分配招商经理的线索

* cc_20251208_visit: (27 commits squashed)

  - feat:拜访记录

  - fix:拜访详情接口新增字段

  - fix:新增状态转义字段

  - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选

  - fix

  - fix:管理员能查看所有加盟商

  - fix:去掉部分字段非空校验

  - fix:空校验

  - Merge branch &#39;master&#39; into cc_20251208_visit

    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java

  - fix

  - fix:拜访记录失效延时消息

  - fix:拜访记录统计

  - fix:拜访记录统计新增筛选条件

  - fix:字段转义

  - feat:拜访调整

  - feat:拜访调整_过滤我的

  - feat:拜访调整_过滤我的

  - feat:拜访字段调整

  - feat:拜访字段调整

  - Merge branch &#39;master&#39; into cc_20251208_visit

  - fix:拜访我的加盟商取消管辖权限过滤

  - Merge branch &#39;master&#39; into cc_20251208_visit

  - fix:新增已分配招商经理的线索查询接口；拜访记录列表接口新增字段

  - fix:新增字段

  - fix:新老加盟商判断逻辑修复；统计接口新增筛选条件

  - fix:过滤未分配招商经理的线索

  - Merge branch &#39;master&#39; into cc_20251208_visit

    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/41
---
 .../src/main/resources/mapper/LineInfoMapper.xml                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
index c4e0337be..78ab59475 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
@@ -657,6 +657,7 @@
         mobile
     from xfsg_line_info
     <where>
+      AND (investment_manager IS NOT NULL AND investment_manager != '')
       <if test="keyword != null and keyword != ''">
         and (mobile like  CONCAT('%', #{keyword} ,'%')
         or username like  CONCAT('%', #{keyword} ,'%'))