|
|
@@ -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,p.remove_portrait as removePortrait
|
|
|
+ scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type,p.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>
|
|
|
@@ -69,7 +69,7 @@
|
|
|
SELECT id,name,1 as isFolder,type,parent_id as parentId,create_time,null as num,null as scene_name,null as
|
|
|
scene_dec,
|
|
|
null as status,null as pay_status,null as thumb,null as web_site,null as is_upgrade,null as sn_code,null as
|
|
|
- view_count, null build_type
|
|
|
+ view_count, null build_type,null as removePortrait
|
|
|
FROM t_folder WHERE rec_status = 'A' and user_id =#{param.userId}
|
|
|
<if test="param.folderType!=null and param.folderType == 0">
|
|
|
and (type = #{param.folderType} or type = 3)
|
lyhzzz