From 33fdb033e0a6b5ef6b2f8ac5fc67ad8222e564e5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 五月 2024 14:49:12 +0800
Subject: [PATCH] 下载文件接口，bug修改
---
src/main/resources/mapper/UserEventLogMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/UserEventLogMapper.xml b/src/main/resources/mapper/UserEventLogMapper.xml
index 61d6817..144858e 100644
--- a/src/main/resources/mapper/UserEventLogMapper.xml
+++ b/src/main/resources/mapper/UserEventLogMapper.xml
@@ -127,7 +127,7 @@
and user_id= #{userId}
</if>
<if test="userName != null">
- and user_name= #{userName}
+ and real_name= #{userName}
</if>
</where>
</select>
@@ -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