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/dz/StockDzMapper.xml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
index 2c81989..e8c32b8 100644
--- a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
@@ -72,10 +72,11 @@
 
     <select id="getDzCheckList" resultType="com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto" parameterType="map">
         SELECT
-        t.*,u.user_name,u.user_code,s.stock_name
+        t.*,u.user_name,u.user_code,s.stock_name,r.user_name AS 'recomUserName'
         FROM t_exchange_apply_order_dz t
         LEFT JOIN tz_user u ON t.party_id = u.user_id
         LEFT JOIN t_stock_dz s ON s.uuid = t.dz_id
+        LEFT JOIN tz_user r ON u.user_recom = r.user_id
         WHERE 1=1
         <if test="state != null and state != ''">
             AND t.state = #{state}
@@ -86,6 +87,14 @@
         <if test="stockType != null and stockType != '' ">
             AND s.stock_type = #{stockType}
         </if>
+        <if test="checkedList!=null">
+            and u.user_id in
+            <foreach collection="checkedList" separator="," index="index" open="(" close=")" item="r">
+                #{r}
+            </foreach>
+
+        </if>
+
         ORDER BY  t.create_time DESC
     </select>
 

--
Gitblit v1.9.3