From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/DeviceMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 26a07f6..cbdd370 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -572,6 +572,9 @@
</select>
<select id="getDevice" resultType="com.moral.entity.Device">
select * from device
- where name like concat('%',#{macOrName},'%')
+ 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 d.state!=4 and mt.city_code=130900
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0