From bb146de0f32bfbbb516e1c25ff4873986d548673 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 15 Jan 2026 10:41:21 +0800
Subject: [PATCH] etf

---
 trading-order-service/src/main/resources/mapper/UserMapper.xml |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/trading-order-service/src/main/resources/mapper/UserMapper.xml b/trading-order-service/src/main/resources/mapper/UserMapper.xml
index 87660d5..9fe66c7 100644
--- a/trading-order-service/src/main/resources/mapper/UserMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/UserMapper.xml
@@ -38,7 +38,9 @@
 
     <select id="listUser" resultType="com.yami.trading.bean.user.dto.UserDto">
 
-        SELECT * FROM tz_user u LEFT JOIN tz_wallet w ON u.user_id=w.user_id
+        SELECT u.*,w.money,r.user_name AS 'recomUserName' FROM tz_user u
+        LEFT JOIN tz_wallet w ON u.user_id=w.user_id
+        LEFT JOIN tz_user r ON u.user_recom=r.user_id
 
         where 1=1 and u.role_name in
         <foreach collection="roleNames" separator="," index="index" open="(" close=")" item="r">
@@ -50,7 +52,7 @@
         </if>
 
         <if test="userName!=null and userName!=''">
-            and u.user_name=#{userName} or u.user_code=#{userName}
+            and (u.user_name=#{userName} or u.user_code=#{userName})
         </if>
 
         <if test="userMail!=null and userMail!=''">
@@ -67,6 +69,9 @@
                 #{r}
             </foreach>
 
+        </if>
+        <if test="recomUserName!=null and recomUserName!=''">
+            and r.user_name like  CONCAT('%', #{recomUserName}, '%')
         </if>
         order by u.create_time desc
     </select>
@@ -95,9 +100,10 @@
 
     <select id="listUserAndRecom" resultType="com.yami.trading.bean.user.dto.UserDataDto">
 
-        SELECT u.*,r.user_name AS 'recomUserName' FROM tz_user u LEFT JOIN
-        tz_user r
-        ON u.user_recom=r.user_id
+        SELECT u.*,r.user_name AS 'recomUserName',w.money FROM tz_user u
+        LEFT JOIN tz_user r ON u.user_recom=r.user_id
+        LEFT JOIN tz_wallet w ON u.user_id=w.user_id
+
 
         where 1=1 and u.role_name in
         <foreach collection="roleNames" separator="," index="index" open="(" close=")" item="r">
@@ -116,7 +122,7 @@
         </if>
 
         <if test="userName!=null and userName!=''">
-            and u.user_name=#{userName} or u.user_code=#{userName}
+            and (u.user_name=#{userName} or u.user_code=#{userName})
         </if>
 
         <if test="userMail!=null and userMail!=''">
@@ -129,6 +135,10 @@
         <if test="lastIp!=null and lastIp!=''">
             and u.user_lastip=#{lastIp}
         </if>
+
+        <if test="recomUserName!=null and recomUserName!=''">
+            and r.user_name like  CONCAT('%', #{recomUserName}, '%')
+        </if>
         order by u.create_time desc
     </select>
 </mapper>

--
Gitblit v1.9.3