x

@@ -57,34 +57,38 @@ class Home extends Base {
         $where = ['email_id'=>$this->getEmails('id')];
         $where = ['email_id'=>$this->getEmails('id')];
 
 
 
 
-        $folder_id = [];
+        $folder_id = ['-'];
         if (app()->requestArr('folder_id')){
         if (app()->requestArr('folder_id')){
             $folder_id = app()->requestArr('folder_id');
             $folder_id = app()->requestArr('folder_id');
         }else{
         }else{
             // 目录
             // 目录
             $folder = app()->request('folder','收件箱');
             $folder = app()->request('folder','收件箱');
-            $folderList = db()->all(folderSql::all($where['email_id']));
-
-            // 文件夹id
-            if($folderList){
-                foreach ($folderList as $item){
-                    if(
-                        // 数组文件夹
-                        (is_array($folder) && in_array($item['folder'],$folder))
-                        || $item['folder'] == $folder
-                    ){
-                        $folder_id[] = $item['id'];
+            if($folder !== true){
+                $folderList = db()->all(folderSql::all($where['email_id']));
+
+                // 文件夹id
+                if($folderList){
+                    foreach ($folderList as $item){
+                        if(
+                            // 数组文件夹
+                            (is_array($folder) && in_array($item['folder'],$folder))
+                            || $item['folder'] == $folder
+                        ){
+                            $folder_id[] = $item['id'];
+                        }
                     }
                     }
                 }
                 }
             }
             }
+
         }
         }
 
 
         if(!$folder_id){
         if(!$folder_id){
             app()->e('folder_not_fount');
             app()->e('folder_not_fount');
         }
         }
+        $folder_id = array_filter($folder_id,'is_int');
 
 
         //目录
         //目录
-        $where['folder_id'] = $folder_id;
+        if($folder_id) $where['folder_id'] = $folder_id;
         if($ids) $where['id'] = $ids;
         if($ids) $where['id'] = $ids;
 
 
         if(paramHas('attachment')){
         if(paramHas('attachment')){