...
|
...
|
@@ -157,7 +157,7 @@ class MailListV2Es extends Base { |
|
|
if($folder=='发件箱'){
|
|
|
$where['to'] = $address['from'];
|
|
|
}else{
|
|
|
$where['from'] = $address['from'];
|
|
|
$where['from.email'] = $address['from'];
|
|
|
}
|
|
|
}
|
|
|
}
|
...
|
...
|
@@ -201,6 +201,12 @@ class MailListV2Es extends Base { |
|
|
];
|
|
|
}
|
|
|
|
|
|
}elseif (in_array($k,['from.email','to'])){
|
|
|
$query['bool']['must'][] = [
|
|
|
'match_phrase' => [
|
|
|
$k=>$v
|
|
|
]
|
|
|
];
|
|
|
}else{
|
|
|
$query['bool']['must'][] = [
|
|
|
'term' => [
|
...
|
...
|
|