From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/DeviceMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 292dcf0..33cac0c 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -575,6 +575,12 @@
where mac like concat('%',#{macOrName},'%')
</select>
<select id="getDeviceByCityCode" resultType="com.moral.entity.Device">
- SELECT d.* FROM `monitor_point` mt,device d where d.monitor_point_id=mt.id and mt.city_code=130900
+ SELECT d.* FROM `monitor_point` mt,device d where d.monitor_point_id=mt.id and d.state!=4 and mt.city_code=130900
+ </select>
+ <select id="getDevicesByAccountId" resultType="com.moral.entity.Device">
+ select d.* from monitor_point as m,device as d
+where d.monitor_point_id=m.id and d.monitor_point_id in
+(select m.id from organization as o,monitor_point as m where o.id = m.organization_id and o.id =
+(select o.id FROM account as a,organization as o where a.organization_id = o.id and a.id = #{id})) and d.is_delete !=1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0