From a69578ed877252e70d45d4753258b3d7b6937606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:24:34 +0800
Subject: [PATCH] a
---
server/src/main/resources/mappers/SystemUserMapper.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/server/src/main/resources/mappers/SystemUserMapper.xml b/server/src/main/resources/mappers/SystemUserMapper.xml
index 57d6361..4bfdd26 100644
--- a/server/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/src/main/resources/mappers/SystemUserMapper.xml
@@ -72,7 +72,11 @@
</resultMap>
<select id="activityLoginVOList" parameterType="doumeemes.dao.ext.dto.ActivityLoginDTO" resultMap="ActivityLoginVO">
+<<<<<<< HEAD
select a.DATA_DATE , count(b.id) as dayActiveUserNum from ( SELECT DATE_FORMAT( DATE_ADD(CONCAT(#{dto.startDate}), INTERVAL(help_topic_id) DAY),'%Y-%m-%d') DATA_DATE
+=======
+ select a.DATA_DATE , count(1) as dayActiveUserNum from ( SELECT DATE_FORMAT( DATE_ADD(CONCAT(#{dto.startDate}), INTERVAL(help_topic_id) DAY),'%Y-%m-%d') DATA_DATE
+>>>>>>> 1.0.3
FROM mysql.help_topic
WHERE TIMESTAMPDIFF(DAY,CONCAT(#{dto.startDate}),CONCAT(#{dto.endDate})) > help_topic_id ) a
left join
@@ -97,11 +101,18 @@
FROM `system_login_log` s left join company c on s.COMPANY_ID = c.ID
<where>
s.COMPANY_ID is not null
+<<<<<<< HEAD
and s.SUCCESS = 1
and s.ORGIN is not null
<if test="dto.orgin != null">
AND s.orgin = #{dto.orgin}
</if>
+=======
+ <if test="dto.orgin != null">
+ AND s.orgin = #{dto.orgin}
+ </if>
+
+>>>>>>> 1.0.3
<if test="dto.companyName != null and dto.companyName != ''">
AND c.`NAME` LIKE CONCAT('%', #{dto.companyName}, '%')
</if>
--
Gitblit v1.9.3