From b967bac24b2fd662ac3b8826700fb76c26690aec Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Tue, 02 Dec 2025 00:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
trading-order-service/src/main/resources/mapper/UserMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/trading-order-service/src/main/resources/mapper/UserMapper.xml b/trading-order-service/src/main/resources/mapper/UserMapper.xml
index e6b6054..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!=''">
@@ -68,6 +70,9 @@
</foreach>
</if>
+ <if test="recomUserName!=null and recomUserName!=''">
+ and r.user_name like CONCAT('%', #{recomUserName}, '%')
+ </if>
order by u.create_time desc
</select>
--
Gitblit v1.9.3