From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/acct/AccountServiceDaoImplMapper.xml | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/acct/AccountServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/acct/AccountServiceDaoImplMapper.xml
index c46facb..5e692d1 100644
--- a/java110-db/src/main/resources/mapper/acct/AccountServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/acct/AccountServiceDaoImplMapper.xml
@@ -104,11 +104,26 @@
<if test="amount !=null and amount != ''">
and t.amount= #{amount}
</if>
+ <if test="hasMoney !=null and hasMoney != ''">
+ and t.amount > 0
+ </if>
<if test="acctType !=null and acctType != ''">
and t.acct_type= #{acctType}
</if>
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
+ </if>
+ <if test="objIds !=null ">
+ and t.obj_id in
+ <foreach collection="objIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="acctIds !=null ">
+ and t.acct_id in
+ <foreach collection="acctIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="acctId !=null and acctId != ''">
and t.acct_id= #{acctId}
@@ -126,7 +141,7 @@
and t.obj_type= #{objType}
</if>
<if test="partId !=null and partId != ''">
- and t.obj_type= #{partId}
+ and t.part_id= #{partId}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -178,11 +193,20 @@
<if test="amount !=null and amount != ''">
and t.amount= #{amount}
</if>
+ <if test="hasMoney !=null and hasMoney != ''">
+ and t.amount > 0
+ </if>
<if test="acctType !=null and acctType != ''">
and t.acct_type= #{acctType}
</if>
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
+ </if>
+ <if test="acctIds !=null ">
+ and t.acct_id in
+ <foreach collection="acctIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="acctId !=null and acctId != ''">
and t.acct_id= #{acctId}
@@ -200,10 +224,8 @@
and t.obj_type= #{objType}
</if>
<if test="partId !=null and partId != ''">
- and t.obj_type= #{partId}
+ and t.part_id= #{partId}
</if>
-
-
</select>
@@ -226,7 +248,7 @@
and t.acct_id= #{acctId}
</if>
<if test="objId !=null and objId != ''">
- and t.obj_id= #{objId},
+ and t.obj_id = #{objId}
</if>
</update>
--
Gitblit v1.8.0