| 
...
 | 
...
 | 
@@ -131,8 +131,7 @@ class MailListV2 extends Base { | 
| 
 | 
 | 
             }
 | 
| 
 | 
 | 
         }
 | 
| 
 | 
 | 
 
 | 
| 
 | 
 | 
         $where = ['lists|email_id'=>$this->getEmails('id')];
 | 
| 
 | 
 | 
 
 | 
| 
 | 
 | 
         $where = [];
 | 
| 
 | 
 | 
         // 目录
 | 
| 
 | 
 | 
         $folder = app()->request('folder','收件箱');
 | 
| 
 | 
 | 
         // 只允许查询这里文件夹
 | 
| 
...
 | 
...
 | 
@@ -170,6 +169,8 @@ class MailListV2 extends Base { | 
| 
 | 
 | 
 
 | 
| 
 | 
 | 
             //目录
 | 
| 
 | 
 | 
             $where['folder_id'] = $folder_id;
 | 
| 
 | 
 | 
         }else{
 | 
| 
 | 
 | 
             $where = ['lists|email_id'=>$this->getEmails('id')];
 | 
| 
 | 
 | 
         }
 | 
| 
 | 
 | 
 
 | 
| 
 | 
 | 
         if($ids) $where['id'] = $ids;
 | 
...
 | 
...
 | 
 |