From 000112976716cb6676e61b35e818481db8eb99a1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 11 十月 2026 14:46:40 +0800
Subject: [PATCH] 天津-奇缘恒艺 录数据需求修改

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

diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index 558b76d..7345072 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -9,9 +9,9 @@
     <select id="listPage" resultType="com.ruoyi.basic.vo.CustomerVo">
         select
         c.*,
-        u.user_name usage_user_name,
+        u.nick_name usage_user_name,
         (
-        select group_concat(u2.user_name separator ', ')
+        select group_concat(u2.nick_name separator ', ')
         from customer_user cu
         left join sys_user u2 on cu.user_id = u2.user_id
         where cu.customer_id = c.id
@@ -43,10 +43,10 @@
             <if test="c.type != null and c.type == 1">
                 and type = #{c.type}
             </if>
-            <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰嶏紝骞朵笖鏄嚜宸遍鐢ㄣ�佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴� -->
+            <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡棰嗙敤锛屽苟涓旀槸鑷繁棰嗙敤銆佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴� -->
             <if test="c.type != null and c.type == 0">
                 and (
-                    (type = #{c.type} or (type = 1 and is_assigned = 1))
+                    (type = #{c.type} or (type = 1 and usage_status = 1))
                     and (
                         c.usage_user = #{loginUserId}
                         or c.create_user = #{loginUserId}
@@ -65,9 +65,9 @@
     <select id="list" resultType="com.ruoyi.basic.vo.CustomerVo">
         select
         c.*,
-        u.user_name usage_user_name,
+        u.nick_name usage_user_name,
         (
-        select group_concat(u2.user_name separator ', ')
+        select group_concat(u2.nick_name separator ', ')
         from customer_user cu
         left join sys_user u2 on cu.user_id = u2.user_id
         where cu.customer_id = c.id
@@ -105,10 +105,10 @@
             <if test="c.type != null and c.type == 1">
                 and type = #{c.type}
             </if>
-            <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰嶏紝骞朵笖鏄嚜宸遍鐢ㄣ�佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴� -->
+            <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡棰嗙敤锛屽苟涓旀槸鑷繁棰嗙敤銆佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴� -->
             <if test="c.type != null and c.type == 0">
                 and (
-                    (type = #{c.type} or (type = 1 and is_assigned = 1))
+                    (type = #{c.type} or (type = 1 and usage_status = 1))
                     and (
                         c.usage_user = #{loginUserId}
                         or c.create_user = #{loginUserId}

--
Gitblit v1.9.3