lyhzzz hai 1 ano
pai
achega
5246b0a9a7

+ 2 - 2
src/main/resources/mapper/ucenter/SceneMapper.xml

@@ -24,7 +24,7 @@
             </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,
         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
@@ -80,7 +80,7 @@
          <if test= 'param.searchKey != null'>
           and s.scene_name like CONCAT('%',#{param.searchKey},'%') or s.num = #{param.searchKey}
          </if>
-    union
+        UNION ALL
         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.rec_status, s.space, s.recommend, s.view_count, s.build_type,s.scene_source FROM `t_scene_pro` s

+ 2 - 2
src/main/resources/mapper/ucenter/SceneProMapper.xml

@@ -38,7 +38,7 @@
         <if test="param.isObj !=null ">
           and  p.is_obj  = #{param.isObj}
         </if>
-        UNION
+        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
         FROM t_scene_plus p
@@ -87,7 +87,7 @@
             order by create_time desc
             limit 1000
             )as tb
-            UNION
+            UNION ALL
         </if>
     </sql>