wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch '备份/dev' into dev

This commit is contained in:
wangliwen 2022-07-22 16:11:22 +08:00
parent 888e148fb4 72cf26ec72
commit 4a4d21bf87
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml
View File

@ -145,7 +145,9 @@
AND tcc.node_name LIKE CONCAT(#{path},'%')
</if>
AND tcc.check_status IN (${map.checkStatus})
<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
@ -193,8 +195,9 @@
AND tcc.node_name LIKE CONCAT(#{path},'%')
</if>
AND tcc.check_status IN (${map.checkStatus})
<if test = "map.checkStatus != null and map.checkStatus != ''">
AND tcc.check_status IN (${map.checkStatus})
</if>
<if test = "map.cameraName != null and map.cameraName != ''">
AND tcc.channel_name LIKE CONCAT('%',#{map.cameraName},'%')