调整优化

@@ -103,12 +103,6 @@ class HomeEs extends Base {
         }
         }
 
 
 
 
-        if($ids) {
-            $query['query']['bool']['must'][] = ['terms'=>[
-                'uuid'=>$ids
-            ]];
-        }
-
         if(paramHas('attachment')){ //附件
         if(paramHas('attachment')){ //附件
             $query['query']['bool']['must'][] = ['term'=>[
             $query['query']['bool']['must'][] = ['term'=>[
                 'is_file'=>$attachment ? 1 : 0
                 'is_file'=>$attachment ? 1 : 0
@@ -206,6 +200,27 @@ class HomeEs extends Base {
 
 
         }
         }
 
 
+        // 超迹 带标签搜索
+        if(app()->request('search_tags') && $ids){
+            // 查询id对应的发件人
+            $search_lists = $this->es->search(['query'=>['bool'=>["must"=>[["terms"=>['uuid'=>$ids]]]]],"_source"  => ["from.email"]],0,10000);
+            if(!empty($search_lists['hits']['hits'])){
+                $query['query']['bool']['must'][] = ['query_string'=>[
+                    'query'=>'from.email:('.implode(' OR ',array_map(function($e){
+                            return '"'.$e['_source']['from']['email'].'"';
+                        },$search_lists['hits']['hits'])).')']
+                ];
+            }else{
+                $query['query']['bool']['must'][] = ['term'=>[
+                    'uuid'=> 0
+                ]];
+            }
+        }elseif($ids) {
+            $query['query']['bool']['must'][] = ['terms'=>[
+                'uuid'=>$ids
+            ]];
+        }
+
 
 
         // 回复
         // 回复
         if (paramHas('answered')){
         if (paramHas('answered')){