From cf42a18aba4da77141dd0ea65918444636f899e1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Dec 2020 10:50:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/DeviceMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 292dcf0..cbdd370 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -575,6 +575,6 @@
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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0