From 963588d724ad97006afcefb33b7a6170a20603f3 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 12 Sep 2025 17:23:25 +0800
Subject: [PATCH] 代理商数据过滤

---
 trading-order-service/src/main/resources/mapper/UserMapper.xml |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/trading-order-service/src/main/resources/mapper/UserMapper.xml b/trading-order-service/src/main/resources/mapper/UserMapper.xml
index 4871ca0..4414f22 100644
--- a/trading-order-service/src/main/resources/mapper/UserMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/UserMapper.xml
@@ -90,18 +90,21 @@
         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">
-            #{r}
-        </foreach>
-
-        <if test="checkedList!=null">
-            and u.user_id in
-            <foreach collection="checkedList" separator="," index="index" open="(" close=")" item="r">
-                    #{r}
+        where 1=1
+        <if test="roleNames != null and roleNames.size() > 0">
+            AND u.role_name IN
+            <foreach collection="roleNames" separator="," open="(" close=")" item="r">
+                #{r}
             </foreach>
-
         </if>
+
+        <if test="checkedList != null and checkedList.size() > 0">
+            AND u.user_id IN
+            <foreach collection="checkedList" separator="," open="(" close=")" item="r">
+                #{r}
+            </foreach>
+        </if>
+
         <if test="userCode!=null and userCode!=''">
             and u.user_code=#{userCode}
         </if>

--
Gitblit v1.9.3