es调整

@@ -155,11 +155,9 @@ class HomeEs extends Base {
             }else if(Verify::sEmail($address)){// 收件人/发件人
             }else if(Verify::sEmail($address)){// 收件人/发件人
                 $query['query']['bool']['must'][] = [
                 $query['query']['bool']['must'][] = [
                     'bool'  =>[
                     'bool'  =>[
-                        'must'=>[
-                            ['match_phrase'=>['from.email'=>$address]]
-                        ],
                         'should'=>[
                         'should'=>[
-                            ['match_phrase'=>['to'=>$address]]
+                            ['bool'=>['must'=>[['match_phrase'=>['from.email'=>$address]]]]],
+                            ['bool'=>['must'=>[['match_phrase'=>['to'=>$address]]]]],
                         ]
                         ]
                     ]
                     ]
                 ];
                 ];

@@ -339,73 +339,7 @@ class MailListV2Es extends Base {
         return ['terms'=>['folder_id'=> $this->getFolderId($folder)]];
         return ['terms'=>['folder_id'=> $this->getFolderId($folder)]];
 
 
     }
     }
-    private function assignSql2(){
-        // 被分配的
-        $assign = app()->request('assign');
-        $sql = '';
-        $query = [];
-        if(!empty($assign['email_id'])){
-            // 分配的联系人
-            $email = array_values(array_intersect($assign['email_id'],$this->getEmails('id')));
-            if($email&&!empty($assign['from'])){
-                $query['must'] = [
-                    ['terms'=>['email_id'=>$email]]
-                ];
-                $query['must'][] = [
-                    'query'=>[
-                        'bool'=>[
-                            'must'=>[
-                                ['terms'=>['from.email'=>$assign['from']]]
-                            ],
-                            'should'=>[
-                                "query_string"  =>[
-                                    "query" =>  implode(' ',$assign['from']),
-                                    'default_field' =>  'to'
-                                ]
-                            ]
-                        ]
-                    ]
-                ];
-            }
 
 
-            // 分配的邮箱
-            $email2 = array_diff($this->getEmails('id'),$assign['email_id']);
-            if($email2){
-                if($query){
-                    $query['must'][] = [
-                        'query'=>[
-                            'bool'=>[
-                                'must'=>[
-                                    $query
-                                ],
-                                'should'=>[
-                                    ['terms'=>['email_id'=>$email2]]
-                                ]
-                            ]
-                        ]
-                    ];
-                    return ['query'=>[
-                        'bool'=> $query
-                    ]];
-                }
-
-                return ['terms'=>['email_id'=>$email2]];
-            }
-
-            if($sql){
-                return ['query'=>[
-                    'bool'=> $query
-                ]];
-            }
-
-
-            return ['term'=>['email_id'=>-1]];
-        }
-
-        // 默认
-        return ['terms'=>['email_id'=> $this->getEmails('id')]];
-
-    }
 
 
     private function assignSql3($folder){
     private function assignSql3($folder){
         // 被分配的
         // 被分配的