文件夹排序

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -322,6 +322,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         User user = userService.getByUserName(username);
         param.setSourceList(getSceneSource(param.getSceneSource()));
         param.setUserId(user.getId());
+        param.setStart( (param.getPageNum() -1 ) * param.getPageSize());
         Page<SceneVo> sceneVoPage = getBaseMapper().pageListAndFolder(new Page<>(param.getPageNum(),param.getPageSize()),param);
 
         List<SceneVo> folderList = sceneVoPage.getRecords().parallelStream().filter(entity -> entity.getIsFolder() == 1).collect(Collectors.toList());

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

@@ -25,8 +25,8 @@
         <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
-        FROM t_scene_pro p 
+        p.status,pay_status,thumb,web_site,0 as is_upgrade,sn_code,view_count
+        FROM t_scene_pro p
         <include refid="sceneJoinCamera"></include>
         WHERE is_upgrade = 0 and  p.rec_status = 'A'
         <include refid="commonWhere"></include>
@@ -37,7 +37,7 @@
         </if>
         UNION
         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
+        scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count
         FROM t_scene_plus p
         LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
         <include refid="sceneJoinCamera"></include>
@@ -59,9 +59,11 @@
 
     <sql id="HasFolder">
         <if test="param.hasFolder == 1">
-        select * from (
-            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 as build_type
+            select * from (
+            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
             FROM t_folder WHERE rec_status = 'A' and type = #{param.folderType} and user_id =#{param.userId}
             <if test="param.folderId!=null">
                 AND parent_id = #{param.folderId}
@@ -69,7 +71,9 @@
             <if test="param.folderId == null">
                 AND parent_id is null
             </if>
-            order by create_time desc ) as tb
+            order by create_time desc
+            limit #{param.start},#{param.pageSize}
+            )as tb
             UNION
         </if>
     </sql>