|
@@ -8,7 +8,7 @@
|
|
|
p.camera_id,p.user_id ,p.data_source
|
|
|
FROM t_scene_pro p
|
|
|
<include refid="sceneJoinCamera"></include>
|
|
|
- WHERE is_upgrade = 0 and p.rec_status = 'A'
|
|
|
+ WHERE is_upgrade = 0 and p.rec_status = 'A' AND ( p.status = 1 OR p.status = -2) AND p.scene_type != 99
|
|
|
<include refid="commonWhere"></include>
|
|
|
<if test="param.sceneName !=null and param.sceneName !=''">
|
|
|
and p.scene_name like CONCAT('%',#{param.sceneName},'%')
|
|
@@ -20,7 +20,7 @@
|
|
|
FROM t_scene_plus p
|
|
|
LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
|
|
|
<include refid="sceneJoinCamera"></include>
|
|
|
- WHERE p.rec_status = 'A'
|
|
|
+ WHERE p.rec_status = 'A' AND ( p.scene_status = 1 OR p.scene_status = -2) AND p.scene_type != 99
|
|
|
<include refid="commonWhere"></include>
|
|
|
<if test="param.sceneName !=null and param.sceneName !=''">
|
|
|
and p.title like CONCAT('%',#{param.sceneName},'%')
|