From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml
index 4fa0e96..13f6083 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml
@@ -20,7 +20,8 @@
incomeId as incomeId,
orderType as orderType,
money as money,
- DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time
+ DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
+ type
from t_income where money > 0
<if test="null != userType">
and userType = #{userType}
@@ -28,8 +29,11 @@
<if test="null != objectId">
and objectId = #{objectId}
</if>
- <if test="null != type">
- and `type` = #{type}
+ <if test="null != type and type.size() > 0">
+ and `type` in
+ <foreach collection="type" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
order by insertTime desc limit #{pageNum}, #{size}
</select>
--
Gitblit v1.7.1