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

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

This commit is contained in:
wangliwen 2022-07-25 14:14:12 +08:00
parent 88c75d5022 f0cc8cc5a9
commit 37d511742c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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>