From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml
index a5e0c50..1cdc7b0 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml
@@ -27,7 +27,7 @@
<!--根据条件查询提现列表-->
<select id="getWithdrawalList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (SELECT
- case when pw.userType = 1 then uu.nickName when pw.userType = 2 then dd.`name` else '' end as userName,
+ case when pw.userType = 1 then uu.nickName when pw.userType = 2 then CONCAT(dd.firstName, " ", dd.lastName) else '' end as userName,
case when pw.userType = 1 then uu.phone when pw.userType = 2 then dd.phone else '' end as userPhone,
pw.*
FROM t_pub_withdrawal as pw
@@ -39,7 +39,7 @@
AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
</if>
<if test="name != null and name != ''">
- and o.name LIKE CONCAT('%',#{name},'%')
+ and o.userName LIKE CONCAT('%',#{name},'%')
</if>
<if test="withdrawalType != null and withdrawalType != ''">
and o.withdrawalType = #{withdrawalType}
@@ -47,8 +47,11 @@
<if test="userType != null and userType != ''">
and o.userType = #{userType}
</if>
- <if test="type != null and type != ''">
+ <if test="type != null and type != '' and type != 3">
and o.type = #{type}
+ </if>
+ <if test="type != null and type != '' and type == 3">
+ and o.type is null
</if>
<if test="state != null and state != ''">
and o.state = #{state}
@@ -59,7 +62,7 @@
<select id="getWithdrawalListNoPage" resultType="map">
SELECT * FROM (SELECT
- case when pw.userType = 1 then uu.nickName when pw.userType = 2 then dd.`name` else '' end as userName,
+ case when pw.userType = 1 then uu.nickName when pw.userType = 2 then CONCAT(dd.firstName, " ", dd.lastName) else '' end as userName,
case when pw.userType = 1 then uu.phone when pw.userType = 2 then dd.phone else '' end as userPhone,
DATE_FORMAT(pw.insertTime, '%Y-%m-%d %H:%i') as applyTime,
pw.*
--
Gitblit v1.7.1