| 
...
 | 
...
 | 
@@ -62,7 +62,7 @@ class Home extends Base { | 
| 
 | 
 | 
             $folder_id = app()->requestArr('folder_id');
 | 
| 
 | 
 | 
         }else{
 | 
| 
 | 
 | 
             // 目录
 | 
| 
 | 
 | 
             $folder = app()->request('folder','收件箱');
 | 
| 
 | 
 | 
             $folder = app()->request('folder','收件箱','folderAlias');
 | 
| 
 | 
 | 
             if($folder !== true || $folder!=='true'){
 | 
| 
 | 
 | 
                 $folderList = db()->all(folderSql::all($where['email_id']));
 | 
| 
 | 
 | 
 
 | 
| 
...
 | 
...
 | 
@@ -804,7 +804,7 @@ class Home extends Base { | 
| 
 | 
 | 
 
 | 
| 
 | 
 | 
         // 全部标记
 | 
| 
 | 
 | 
         if(!$mail_ids){
 | 
| 
 | 
 | 
             $folder = app()->request('folder','收件箱');
 | 
| 
 | 
 | 
             $folder = app()->request('folder','收件箱','folderAlias');
 | 
| 
 | 
 | 
             // 查询 当前的 文件夹 如果有选中文件夹 就 查询出 选中文件夹的id
 | 
| 
 | 
 | 
             $fids = db()->all(folderSql::all(array_column($emails,'id'),'`id`,`folder`'));
 | 
| 
 | 
 | 
             foreach ($fids as $fk=>$fid){
 | 
...
 | 
...
 | 
 |