diff --git a/file-web/src/main/java/com/mac/scp/controller/FileController.java b/file-web/src/main/java/com/mac/scp/controller/FileController.java index 859f1ee..91cbde7 100644 --- a/file-web/src/main/java/com/mac/scp/controller/FileController.java +++ b/file-web/src/main/java/com/mac/scp/controller/FileController.java @@ -77,21 +77,16 @@ public class FileController { fileBean.setUserid(2); }else { UserBean sessionUserBean = (UserBean) SecurityUtils.getSubject().getPrincipal(); + if (fileBean == null) { + restResult.setSuccess(false); + return restResult; + } fileBean.setUserid(sessionUserBean.getUserId()); } fileBean.setFilepath(PathUtil.urlDecode(fileBean.getFilepath())); List fileList = fileService.selectFileList(fileBean); - if ("/".equals(fileBean.getFilepath())){ - FileBean albumFile = new FileBean(); - albumFile.setFilename("我的相册"); - - albumFile.setFilepath("/"); - albumFile.setIsdir(1); - fileList.add(albumFile); - } - restResult.setData(fileList); restResult.setSuccess(true);