From f0cc8cc5a9263aee199275a64ac58662936b549b Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Mon, 25 Jul 2022 14:01:45 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=83=BD=E5=8A=9B=E8=B6=85=E5=B8=82?=
 =?UTF-8?q?=E3=80=81=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E3=80=81=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E8=B5=84=E6=BA=90=E7=9A=84=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0gps=E5=9D=90=E6=A0=87=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/monitor/CameraChannelMapper.xml    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml b/renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml
index 32fafddb..47c2678a 100644
--- a/renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml
+++ b/renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml
@@ -198,7 +198,10 @@
         <if test = "map.checkStatus != null and map.checkStatus != ''">
             AND tcc.check_status IN (${map.checkStatus})
         </if>
-
+        AND tcc.gps_x != ''
+        AND tcc.gps_y != ''
+        AND tcc.gps_x IS NOT NULL
+        AND tcc.gps_y IS NOT NULL
         <if test = "map.cameraName != null and map.cameraName != ''">
             AND tcc.channel_name LIKE CONCAT('%',#{map.cameraName},'%')
         </if>