From 263a13a155ec759b1cb26cc00edd640f4d2e747c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 19 九月 2024 16:46:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/resources/mapper/point/CustomerPointMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/point/CustomerPointMapper.xml b/src/main/resources/mapper/point/CustomerPointMapper.xml
index 9514779..004ba1c 100644
--- a/src/main/resources/mapper/point/CustomerPointMapper.xml
+++ b/src/main/resources/mapper/point/CustomerPointMapper.xml
@@ -35,14 +35,14 @@
<if test="dto.userId!= null and dto.userId != ''">
and t.user_id = #{dto.userId}
</if>
- <if test="dto.recordDateStart!=null ">
+ <if test="dto.recordDateStart!=null and dto.recordDateStart!='' ">
<![CDATA[
- AND t.record_date >= #{dto.createDateBegin}
+ AND t.record_date >= #{dto.recordDateStart}
]]>
</if>
- <if test="dto.recordDateEnd!=null ">
+ <if test="dto.recordDateEnd!=null and dto.recordDateEnd!='' ">
<![CDATA[
- AND t.record_date <= #{dto.createDateEnd}
+ AND t.record_date <= #{dto.recordDateEnd}
]]>
</if>
<if test="dto.type!=null and dto.type != null">
--
Gitblit v1.9.3