From 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3 Mon Sep 17 00:00:00 2001 From: Cui Zhi Feng <cuizf@fengyuntec.com> Date: 星期一, 02 九月 2024 20:18:52 +0800 Subject: [PATCH] Merge branch 'master' 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