优化

@@ -65,7 +65,7 @@ class MailListV2Es2 extends Base {
         $folder = app()->request('folder','收件箱');
         $folder = app()->request('folder','收件箱');
         // 只允许查询这里文件夹
         // 只允许查询这里文件夹
         if(!in_array($folder,['收件箱','发件箱','垃圾箱','星标邮件','预热收件箱','预热发件箱','自动回复收件箱','Starred','草稿箱'])){
         if(!in_array($folder,['收件箱','发件箱','垃圾箱','星标邮件','预热收件箱','预热发件箱','自动回复收件箱','Starred','草稿箱'])){
-            app()->e('folder_not_fount');
+            $folder = '';
         }
         }
 
 
 
 
@@ -96,6 +96,9 @@ class MailListV2Es2 extends Base {
             $where['folder_as_int'] = folder2int('收件箱');
             $where['folder_as_int'] = folder2int('收件箱');
         }elseif ($folder=='草稿箱' || $folder=='垃圾箱'){
         }elseif ($folder=='草稿箱' || $folder=='垃圾箱'){
             $where['folder_as_int'] = folder2int($folder); // 所有
             $where['folder_as_int'] = folder2int($folder); // 所有
+        }else{
+            $where['folder_as_int'] = [1,2,3,4,5]; // 所有
+            unset($where['is_hots'],$where['is_auto']);
         }
         }
 
 
         // 已读/未读
         // 已读/未读