From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001 From: gongzuming <gongzuming> Date: 星期四, 19 九月 2024 16:59:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/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