From ed8f0aeffb619c0540b16420320973207c55f015 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 08:52:49 +0800
Subject: [PATCH] 地图点击关闭弹窗
---
src/main/resources/mapper/HistoryMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 2ca98f3..2527cdf 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -18,14 +18,17 @@
mp.area_code = #{areaCode}
AND h.time >= #{start}
AND h.time < #{end}
+ AND h.mac = d.mac
+ AND d.monitor_point_id = mp.id
<if test="orgIds != null and orgIds.size > 0">
AND mp.organization_id IN
<foreach collection="orgIds" open="(" separator="," close=")" item="listItem">
#{listItem}
</foreach>
</if>
- AND h.mac = d.mac
- AND d.monitor_point_id = mp.id
+ <if test="deviceVersionId != null">
+ AND d.device_version_id = #{deviceVersionId}
+ </if>
<if test="macKey != 'all'">
GROUP BY d.id
ORDER BY avg desc
--
Gitblit v1.8.0