From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
server/src/main/resources/mappers/SystemUserMapper.xml | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/server/src/main/resources/mappers/SystemUserMapper.xml b/server/src/main/resources/mappers/SystemUserMapper.xml
index 80066dd..f641d31 100644
--- a/server/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/src/main/resources/mappers/SystemUserMapper.xml
@@ -72,7 +72,15 @@
</resultMap>
<select id="activityLoginVOList" parameterType="doumeemes.dao.ext.dto.ActivityLoginDTO" resultMap="ActivityLoginVO">
+<<<<<<< HEAD
+<<<<<<< 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
+=======
+ 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
+>>>>>>> dev
FROM mysql.help_topic
WHERE TIMESTAMPDIFF(DAY,CONCAT(#{dto.startDate}),CONCAT(#{dto.endDate})) > help_topic_id ) a
left join
@@ -97,10 +105,26 @@
FROM `system_login_log` s left join company c on s.COMPANY_ID = c.ID
<where>
s.COMPANY_ID is not null
+<<<<<<< HEAD
+<<<<<<< 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
+=======
+ and s.SUCCESS = 1
+ and s.ORGIN is not null
+ <if test="dto.orgin != null">
+ AND s.orgin = #{dto.orgin}
+ </if>
+>>>>>>> dev
<if test="dto.companyName != null and dto.companyName != ''">
AND c.`NAME` LIKE CONCAT('%', #{dto.companyName}, '%')
</if>
--
Gitblit v1.9.3