From c447386e06ce5927fb6e3ccb22ee673535b3f566 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 08 七月 2024 18:21:26 +0800
Subject: [PATCH] 标签增加部门字段、分页调整(未做权限)

---
 src/main/resources/mapper/UserEventLogMapper.xml |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/UserEventLogMapper.xml b/src/main/resources/mapper/UserEventLogMapper.xml
index 10db8ed..144858e 100644
--- a/src/main/resources/mapper/UserEventLogMapper.xml
+++ b/src/main/resources/mapper/UserEventLogMapper.xml
@@ -136,7 +136,17 @@
   <select id="selectCountByDate"  resultType="com.mindskip.xzs.domain.other.KeyValue">
 		SELECT create_time as name,COUNT(create_time) as value from
 		        (
-				  SELECT DATE_FORMAT(create_time,'%Y-%m-%d') as create_time from t_user_event_log
+				  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
+                  <if test="deptIds != null and deptIds.size() > 0">
+                    where department_id in
+                    <foreach collection="deptIds" item="item" open="(" separator="," close=")">
+                      #{item}
+                    </foreach>
+                  </if>
+                  group by user_id)
+                  b on a.user_id = b.user_id
 					WHERE  create_time  between  #{startTime}  and  #{endTime}
 				) a
 		GROUP BY create_time

--
Gitblit v1.8.0