|
@@ -25,7 +25,7 @@
|
|
|
<include refid="HasFolder"></include>
|
|
|
SELECT * FROM (
|
|
|
SELECT p.id ,null as name ,0 as isFolder,null as type,null as parentId ,p.create_time,num,scene_name,scene_dec,
|
|
|
- p.status,pay_status,thumb,web_site,0 as is_upgrade,sn_code,view_count,p.build_type
|
|
|
+ p.status,pay_status,thumb,web_site,0 as is_upgrade,sn_code,view_count,p.build_type, null as removePortrait
|
|
|
FROM t_scene_pro p
|
|
|
<include refid="sceneJoinCamera"></include>
|
|
|
WHERE is_upgrade = 0 and p.rec_status = 'A'
|
|
@@ -40,7 +40,7 @@
|
|
|
</if>
|
|
|
UNION ALL
|
|
|
SELECT p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,e.algorithm_time as createTime ,num,title as scene_name,description as scene_dec,
|
|
|
- scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type
|
|
|
+ scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type,s.remove_portrait as removePortrait
|
|
|
FROM t_scene_plus p
|
|
|
LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
|
|
|
<include refid="sceneJoinCamera"></include>
|