From 08d8b029b10706b135713424e9b2a1b6e3839372 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 23 八月 2020 22:40:01 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
index fe5d5fb..7000564 100644
--- a/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml
@@ -179,6 +179,9 @@
<if test="endTime !=null ">
and t.end_time= #{endTime}
</if>
+ <if test="valid !=null and valid == 1">
+ and t.end_time > now()
+ </if>
<if test="curTime !=null ">
and t.end_time > #{curTime}
and t.start_time < #{curTime}
@@ -308,6 +311,9 @@
<if test="endTime !=null ">
and t.end_time= #{endTime}
</if>
+ <if test="valid !=null and valid == 1">
+ and t.end_time > now()
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
--
Gitblit v1.8.0