1

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

@@ -159,11 +159,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
             param.setProjectNums(projectNums);
         }
-        if(param.getFolderId() != null){
-            List<ManageFolderScene> byFolderId = manageFolderSceneService.getByFolderId(param.getFolderId());
-            List<String> collect = byFolderId.stream().map(ManageFolderScene::getNum).collect(Collectors.toList());
-            param.getProjectNums().addAll(collect);
-        }
+//        if(param.getFolderId() != null){
+//            List<ManageFolderScene> byFolderId = manageFolderSceneService.getByFolderId(param.getFolderId());
+//            List<String> collect = byFolderId.stream().map(ManageFolderScene::getNum).collect(Collectors.toList());
+//            param.getProjectNums().addAll(collect);
+//        }
 
         Page<SceneVo> page  = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         List<String> sceneNumList = page.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());

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

@@ -53,7 +53,7 @@
             and s.scene_status = #{param.status}
         </if>
         ) as tb
-        order by create_time desc
+        order by create_time,id desc
     </select>
 
 
@@ -62,7 +62,15 @@
         left join t_camera c on s.camera_id = c.id
         left join t_camera_detail d on c.id = d.camera_id
         left join t_company co on u.company_id = co.id
+        left join t_manage_folder_scene fs on s.num = fs.num
         where s.rec_status = 'A'
+        <if test="param.haveFolder != null and param.haveFolder ==1 and param.folderId == null">
+            and fs.id is null
+        </if>
+        <if test="param.haveFolder != null and param.haveFolder ==1 and param.folderId != null">
+            and fs.folder_id = #{param.folderId}
+        </if>
+
         <if test="param.num != null and param.num !='' ">
             and s.num like concat ('%',#{param.num},'%')
         </if>