...
|
...
|
@@ -72,7 +72,7 @@ class HomeEs extends Base { |
|
|
}else{
|
|
|
// 目录
|
|
|
$folder = app()->request('folder','收件箱','folderAlias');
|
|
|
if($folder !== true || $folder!=='true'){
|
|
|
if(!($folder === true || $folder ==='true')){
|
|
|
$folderList = db()->all(folderSql::all($this->getEmails('id')));
|
|
|
|
|
|
// 文件夹id
|
...
|
...
|
@@ -95,10 +95,6 @@ class HomeEs extends Base { |
|
|
$query['query']['bool']['must'][] = ['terms'=>[
|
|
|
'folder_id'=>$folder_id
|
|
|
]];
|
|
|
}else{
|
|
|
$query['query']['bool']['must'][] = ['terms'=>[
|
|
|
'email_id'=> $this->getEmails('id')
|
|
|
]];
|
|
|
}
|
|
|
|
|
|
|
...
|
...
|
@@ -156,7 +152,7 @@ class HomeEs extends Base { |
|
|
];
|
|
|
}
|
|
|
|
|
|
}else if(Verify::sEmail($address)){// 收件人/发件人
|
|
|
}else if($address){// 收件人/发件人
|
|
|
$query['query']['bool']['must'][] = [
|
|
|
'bool' =>[
|
|
|
'should'=>[
|
...
|
...
|
|