From 43f0b2f236f6ac2e30989c43a802c4e2def85a48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <machaop@dcits.com>
Date: Mon, 10 Feb 2020 23:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E7=9B=B8=E5=86=8C=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mac/scp/controller/FileController.java | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

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<FileBean> 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);