作者 邓超

es

@@ -276,7 +276,7 @@ class MailListV2Es extends Base { @@ -276,7 +276,7 @@ class MailListV2Es extends Base {
276 'must' => [ 276 'must' => [
277 ['terms'=>['folder_id'=>$fids]], 277 ['terms'=>['folder_id'=>$fids]],
278 ['query_string'=>[ 278 ['query_string'=>[
279 - 'query'=> implode(' ',$assign['from']), 279 + 'query'=> implode(' OR ',$assign['from']),
280 'default_field'=>'to' 280 'default_field'=>'to'
281 ]] 281 ]]
282 ] 282 ]
@@ -287,7 +287,11 @@ class MailListV2Es extends Base { @@ -287,7 +287,11 @@ class MailListV2Es extends Base {
287 'bool' => [ 287 'bool' => [
288 'must' => [ 288 'must' => [
289 ['terms'=>['folder_id'=>$fids]], 289 ['terms'=>['folder_id'=>$fids]],
290 - ['terms'=>['from.email'=>$assign['from']]], 290 + ['query_string'=>[
  291 + 'query'=>'from.email:('.implode(' OR ',array_map(function($e){
  292 + return '"'.$e.'"';
  293 + },$assign['from'])).')']
  294 + ],
291 ] 295 ]
292 ] 296 ]
293 ]; 297 ];