|
@@ -24,7 +24,7 @@
|
|
</if>
|
|
</if>
|
|
)
|
|
)
|
|
</if>
|
|
</if>
|
|
- UNION
|
|
|
|
|
|
+ UNION ALL
|
|
SELECT p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,p.create_time ,num,title as scene_name,description as scene_dec,
|
|
SELECT p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,p.create_time ,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.scene_type
|
|
scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,e.build_type,p.scene_type
|
|
FROM t_scene_plus p
|
|
FROM t_scene_plus p
|
|
@@ -80,7 +80,7 @@
|
|
<if test= 'param.searchKey != null'>
|
|
<if test= 'param.searchKey != null'>
|
|
and s.scene_name like CONCAT('%',#{param.searchKey},'%') or s.num = #{param.searchKey}
|
|
and s.scene_name like CONCAT('%',#{param.searchKey},'%') or s.num = #{param.searchKey}
|
|
</if>
|
|
</if>
|
|
- union
|
|
|
|
|
|
+ UNION ALL
|
|
SELECT s.id,s.scene_name, s.scene_dec, s.web_site, s.thumb, s.scene_type,
|
|
SELECT s.id,s.scene_name, s.scene_dec, s.web_site, s.thumb, s.scene_type,
|
|
s.create_time, s.status, s.user_id, s.pay_status, s.camera_id, s.num, s.scene_scheme, s.shoot_count,
|
|
s.create_time, s.status, s.user_id, s.pay_status, s.camera_id, s.num, s.scene_scheme, s.shoot_count,
|
|
s.rec_status, s.space, s.recommend, s.view_count, s.build_type,s.scene_source FROM `t_scene_pro` s
|
|
s.rec_status, s.space, s.recommend, s.view_count, s.build_type,s.scene_source FROM `t_scene_pro` s
|