From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 64c99ba..12d7c7b 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -251,6 +251,9 @@
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=",">
--
Gitblit v1.8.0