云端场景列表深时深光

src/main/resources/mapper/ucenter/ScenePlusMapper.xml

@@ -6,6 +6,7 @@
         left join t_user u on p.user_id = u.id
         left join t_camera c on p.camera_id = c.id
         left join t_camera_detail d on c.id = d.camera_id
+        where   p.rec_status = 'A'   AND ( p.status = 1 OR p.status = -2) AND p.scene_type != 99
         <if test="param.sceneType !=null and param.sceneType !=''">
             and  p.scene_type  = #{param.sceneType}
         </if>
@@ -38,7 +39,7 @@
         p.camera_id,p.user_id ,p.data_source,p.scene_type,build_type,c.sn_code,c.child_name
         FROM t_scene_pro p
         <include refid="commonWhere"></include>
-        and is_upgrade = 0 and  p.rec_status = 'A'   AND ( p.status = 1 OR p.status = -2) AND p.scene_type != 99
+        and is_upgrade = 0
         <if test="param.sceneName !=null and param.sceneName !=''">
             and  p.scene_name like CONCAT('%',#{param.sceneName},'%')
         </if>
@@ -49,7 +50,7 @@
         FROM t_scene_plus p
         LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
         <include refid="commonWhere"></include>
-        and  p.rec_status = 'A' AND ( p.scene_status = 1 OR p.scene_status = -2) AND p.scene_type != 99 and e.location !=7
+        and  e.location !=7
         <if test="param.sceneName !=null and param.sceneName !=''">
             and  p.title like CONCAT('%',#{param.sceneName},'%')
         </if>