From c383c8ca7053005ffa3ee58efd89956fbf52c9ea Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 07 五月 2026 11:34:19 +0800
Subject: [PATCH] 重构客户档案

---
 src/main/resources/mapper/basic/CustomerMapper.xml |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index 3b42238..1e7df5c 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -12,10 +12,10 @@
         u.user_name usage_user_name,
         (
         select group_concat(u2.user_name separator ', ')
-        from customer_private_pool cpp2
-        left join sys_user u2 on cpp2.bound_id = u2.user_id
-        where cpp2.customer_id = c.id and cpp2.delete_flag = 0
-        and cpp2.bound_id != c.usage_user
+        from customer_user cu
+        left join sys_user u2 on cu.user_id = u2.user_id
+        where cu.customer_id = c.id
+        and cu.user_id != c.usage_user
         ) as together_user_names
         from customer c
         left join sys_user u on c.usage_user = u.user_id
@@ -26,8 +26,16 @@
             <if test="c.customerType != null and c.customerType != ''">
                 and customer_type = #{c.customerType}
             </if>
+            <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰� -->
+            <if test="c.type != null and c.type == 0">
+                and type = #{c.type} or (type = 1 and is_assigned = 1)
+            </if>
+            <!-- 鍏捣鏌ヨ锛歵ype = 1锛堝叕娴峰鎴凤級-->
+            <if test="c.type != null and c.type == 1">
+                and type = #{c.type}
+            </if>
         </where>
     </select>
 
 
-</mapper>
+</mapper>
\ No newline at end of file

--
Gitblit v1.9.3