From cdd0abecb96bb1b6dfa32e8a9cbb406ce3b4ed7d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 八月 2021 17:02:08 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 3d4a676..387b24d
--- a/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PayFeeAuditServiceDaoImplMapper.xml
@@ -28,7 +28,7 @@
where 1=1
and pfd.community_id = #{communityId}
and pfd.status_cd = '0'
- and pfd.state is null
+ and pfd.state = '1400'
<if test="roomId !=null and roomId != ''">
and pf.payer_obj_id = #{roomId}
and pf.payer_obj_type = '3333'
@@ -43,9 +43,11 @@
<if test="payerObjType !=null and payerObjType != ''">
and pf.payer_obj_type = #{payerObjType}
</if>
- <if test="state !=null and state != ''">
- and (pfa.state is null
- or pfa.state = #{state})
+ <if test="state !=null and state != '1010'">
+ and pfa.state = #{state}
+ </if>
+ <if test="state !=null and state == '1010'">
+ and pfa.state is null
</if>
ORDER BY pfd.create_time desc
<if test="page != -1 and page != null ">
@@ -98,6 +100,7 @@
where 1=1
and pfd.community_id = #{communityId}
and pfd.status_cd = '0'
+ and pfd.state = '1400'
<if test="roomId !=null and roomId != ''">
and pf.payer_obj_id = #{roomId}
and pf.payer_obj_type = '3333'
@@ -112,13 +115,11 @@
<if test="payerObjType !=null and payerObjType != ''">
and pf.payer_obj_type = #{payerObjType}
</if>
- <if test="state !=null and state != ''">
- and (pfa.state is null
- or pfa.state = #{state})
+ <if test="state !=null and state != '1010'">
+ and pfa.state = #{state}
</if>
- <if test="state !=null and state != ''">
- and (pfa.state is null
- or pfa.state = #{state})
+ <if test="state !=null and state == '1010'">
+ and pfa.state is null
</if>
--
Gitblit v1.8.0