From f0b5148973e9437f3651153e53f8f336c4c3c6ff Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 22 Oct 2020 11:19:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/DeviceMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 79771cb..84e4e42 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -561,4 +561,8 @@
<select id="byMacGetOrgId" resultType="java.lang.String">
SELECT organization_id FROM `monitor_point` as mt ,device as d where d.monitor_point_id=mt.id and mac=#{mac}
</select>
+
+ <select id="getDevicesByMpId" resultType="java.util.Map">
+ select name,mac from device where monitor_point_id=#{mpId} and is_delete=0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0