From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 570004a..12d7c7b 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -251,13 +251,16 @@
FROM
device as d
inner JOIN organization o on o.id = d.organization_id and o.is_delete = 0
+ <if test="monitorId !=null and monitorId !=''">
+ and monitor_point_id =#{monitorId}
+ </if>
<if test="organizationIds != null and organizationIds.size !=0">
and organization_id in
<foreach collection="organizationIds" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
</if>
- inner JOIN device_map_hierarchy as dm on d.id = dm.device_id
+ left JOIN device_map_hierarchy as dm on d.id = dm.device_id
<if test="tableName !=null">
left join history_hourly${tableName} hd on hd.time = #{start} and d.mac = hd.mac
</if>
--
Gitblit v1.8.0