From 06bcdd67a10a70d54064fd7bce834d4e71ec55fe Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 07 Jan 2026 17:17:24 +0800
Subject: [PATCH] 1

---
 src/main/resources/mapper/UserRechargeMapper.xml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/UserRechargeMapper.xml b/src/main/resources/mapper/UserRechargeMapper.xml
index 2f36d6c..5ee756f 100644
--- a/src/main/resources/mapper/UserRechargeMapper.xml
+++ b/src/main/resources/mapper/UserRechargeMapper.xml
@@ -217,10 +217,10 @@
     s.id, s.user_id, s.nick_name, s.agent_id, s.order_sn, s.pay_sn, s.pay_channel,
     s.pay_amt, s.order_status,s.order_desc,s.add_time,s.pay_time,s.pay_id,s.img ,p.channel_name,p.assets_type
     FROM user_recharge s
-    join site_pay p
+    left join site_pay p
     on s.pay_id = p.id
-    where  agent_id != 1
-    <if test="agentId != null">
+    where  1=1
+    <if test="agentId != null and agentId != ''">
       and ( agent_id = #{agentId}
       or agent_id in (
       select agent_user.id
@@ -229,20 +229,20 @@
       )
       )
     </if>
-    <if test="userId != null">
+    <if test="userId != null and agentId != ''">
       and user_id = #{userId}
     </if>
     <if test="realName != null and realName != '' ">
       and nick_name like CONCAT('%','${realName}','%')
     </if>
-    <if test="state != null">
+    <if test="state != null and agentId != ''">
       and order_status = #{state}
     </if>
 
-    <if test="begin_time != null ">
+    <if test="begin_time != null  and agentId != ''">
       and pay_time <![CDATA[>=]]> #{begin_time}
     </if>
-    <if test="end_time != null ">
+    <if test="end_time != null and agentId != ''">
       and pay_time <![CDATA[<=]]> #{end_time}
     </if>
     ORDER BY s.id DESC

--
Gitblit v1.9.3