From 8d78326b854d2541a5038073ab027bfc33417d33 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 14 十月 2021 15:04:08 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/acct/AccountDetailServiceDaoImplMapper.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/acct/AccountDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/acct/AccountDetailServiceDaoImplMapper.xml
index 2c810b0..485bc19 100644
--- a/java110-db/src/main/resources/mapper/acct/AccountDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/acct/AccountDetailServiceDaoImplMapper.xml
@@ -142,6 +142,9 @@
<if test="objType !=null and objType != ''">
and t.obj_type= #{objType}
</if>
+ <if test="acctType !=null and acctType != ''">
+ and ac.acct_type= #{acctType}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -194,6 +197,7 @@
<select id="queryAccountDetailsCount" parameterType="Map" resultType="Map">
select count(1) count
from account_detail t
+ LEFT JOIN account ac on t.acct_id = ac.acct_id and ac.status_cd = '0' and ac.obj_id = t.obj_id
where 1 =1
<if test="detailType !=null and detailType != ''">
and t.detail_type= #{detailType}
@@ -225,6 +229,9 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
+ <if test="acctType !=null and acctType != ''">
+ and ac.acct_type= #{acctType}
+ </if>
<if test="objType !=null and objType != ''">
and t.obj_type= #{objType}
</if>
--
Gitblit v1.8.0