21

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

@@ -324,7 +324,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() == -1){              //双目文件夹场景
+        if(param.getFolderId()!= null && param.getFolderId() == -1){              //双目文件夹场景
             return sceneService.pageList(param);
         }
         Page<SceneVo> sceneVoPage = getBaseMapper().pageListAndFolder(new Page<>(param.getPageNum(),param.getPageSize()),param);
@@ -358,7 +358,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 }
             }
         }
-        if(param.getSceneSource().equals("1") && param.getPageNum() == 1){         //增加双目文件夹
+        if(param.getSceneSource()!= null && param.getSceneSource().equals("1") && param.getPageNum() == 1){         //增加双目文件夹
             SceneVo sceneVo = new SceneVo();
             sceneVo.setId(-1L);
             sceneVo.setIsFolder(1);