From 49726442d0bad78c9211b7ea13d688c03b916ff6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 03 九月 2024 17:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/resources/mapper/point/CustomerPointDetailMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/point/CustomerPointDetailMapper.xml b/src/main/resources/mapper/point/CustomerPointDetailMapper.xml
index 4e7b369..6c228fb 100644
--- a/src/main/resources/mapper/point/CustomerPointDetailMapper.xml
+++ b/src/main/resources/mapper/point/CustomerPointDetailMapper.xml
@@ -29,9 +29,12 @@
WHERE p.deleted= 0
<if test="lastYear!=null ">
<![CDATA[
- p.record_date <= #{lastYear}
+ and p.record_date <= #{lastYear}
]]>
</if>
+ <if test="userId!=null and userId!=''">
+ and p.user_id = #{userId}
+ </if>
GROUP BY
p.user_id,
p.customer_id
--
Gitblit v1.9.3