2

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

@@ -326,9 +326,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         User user = userService.getByUserName(username);
         param.setSourceList(getSceneSource(param.getSceneSource()));
         param.setUserId(user.getId());
-        if(param.getFolderId()!= null && param.getFolderId() == -1){              //双目文件夹场景
-            return sceneService.pageList(param);
-        }
+
         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());
@@ -363,7 +361,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(param.getSceneSource()!= null && param.getSceneSource().equals("1")
                 && param.getPageNum() == 1 && param.getHasFolder() == 1 && param.getFolderId() == null){         //增加双目文件夹
             SceneVo sceneVo = new SceneVo();
-            sceneVo.setId(-1L);
             sceneVo.setIsFolder(1);
             sceneVo.setName("双目文件夹");
             sceneVo.setType("3");