From b7dcf93fb388dabc124e81552ef1aaa65268f2e7 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Fri, 16 Jun 2023 09:46:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=89=AB=E7=89=A9=E4=B8=9A=E7=A0=81?=
 =?UTF-8?q?=E5=92=8C=E5=90=8E=E5=8F=B0=E6=B3=A8=E5=86=8C=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=E5=91=98=E7=9A=84=E6=97=B6=E5=80=99=20user=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E4=B8=AD=E6=8E=A8=E5=B9=BF=E5=91=98id=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E4=B8=BA=E8=87=AA=E5=B7=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/recharge/RechargeOrderMapper.xml    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
index 062f71e85..9e8f652c5 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
@@ -107,7 +107,7 @@
         a.out_trade_no,
         a.pay_time,
         b.nickname,
-        a.real_name,
+        x.nickname as realName,
         a.uid,
         a.user_phone,
         a.confirm_phone,
@@ -124,6 +124,7 @@
         left join member_user b on a.promoter_id = b.id
         left join system_dept d on d.id = a.dept_id
         left join system_tenant e on e.id = a.tenant_id
+        left join member_user x on a.uid = x.id
         <include refid="baseWhere">
         </include>
         order by a.pay_time desc
@@ -249,9 +250,9 @@
             <if test="data.nickname !=null and data.nickname!=''">
                 and b.nickname like CONCAT('%',#{data.nickname},'%')
             </if>
-            <!--<if test="data.realName !=null and data.realName!=''">
-                and a.real_name like CONCAT('%',#{data.realName},'%')
-            </if>-->
+            <if test="data.realName !=null and data.realName!=''">
+                and x.real_name like CONCAT('%',#{data.realName},'%')
+            </if>
             <if test="data.userPhone !=null and data.userPhone!=''">
                 and a.user_phone like CONCAT('%',#{data.userPhone},'%')
             </if>