作者 邓超

es

... ... @@ -272,7 +272,6 @@ class MailListV2Es extends Base {
if($fids && !empty($assign['from'])){
if($folder=='发件箱'){
$query = [
'query' =>[
'bool' => [
'must' => [
['terms'=>['folder_id'=>$fids]],
... ... @@ -282,18 +281,15 @@ class MailListV2Es extends Base {
]]
]
]
]
];
}else{
$query = [
'query' =>[
'bool' => [
'must' => [
['terms'=>['folder_id'=>$fids]],
['terms'=>['from.email'=>$assign['from']]],
]
]
]
];
}
}
... ... @@ -304,7 +300,6 @@ class MailListV2Es extends Base {
if($query && $afids){
return [
'query' =>[
'bool' => [
'must' => [
$query
... ... @@ -313,7 +308,6 @@ class MailListV2Es extends Base {
['terms'=>['folder_id'=>$afids]]
]
]
]
];
}else if($afids){
return ['terms'=>['folder_id'=>$afids]];
... ...