From 72fe8a562375629dc84cac9c3adf2c24c51d409b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 16 五月 2024 18:20:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/UserEventLogMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/UserEventLogMapper.xml b/src/main/resources/mapper/UserEventLogMapper.xml
index 80037ce..144858e 100644
--- a/src/main/resources/mapper/UserEventLogMapper.xml
+++ b/src/main/resources/mapper/UserEventLogMapper.xml
@@ -139,12 +139,12 @@
SELECT DATE_FORMAT(create_time,'%Y-%m-%d') as create_time from t_user_event_log a
inner join
(select user_id from t_user_department
- <where>
- and department_id in
+ <if test="deptIds != null and deptIds.size() > 0">
+ where department_id in
<foreach collection="deptIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
- </where>
+ </if>
group by user_id)
b on a.user_id = b.user_id
WHERE create_time between #{startTime} and #{endTime}
--
Gitblit v1.8.0