作者 邓超

es调整

@@ -91,12 +91,16 @@ class HomeEs extends Base { @@ -91,12 +91,16 @@ class HomeEs extends Base {
91 91
92 } 92 }
93 93
94 - if(!$folder_id){  
95 - app()->e('folder_not_fount'); 94 + if($folder_id){
  95 + $query['query']['bool']['must'][] = ['terms'=>[
  96 + 'folder_id'=>$folder_id
  97 + ]];
  98 + }else{
  99 + $query['query']['bool']['must'][] = ['terms'=>[
  100 + 'email_id'=> $this->getEmails('id')
  101 + ]];
96 } 102 }
97 - $query['query']['bool']['must'][] = ['terms'=>[  
98 - 'folder_id'=>$folder_id  
99 - ]]; 103 +
100 104
101 if($ids) { 105 if($ids) {
102 $query['query']['bool']['must'][] = ['terms'=>[ 106 $query['query']['bool']['must'][] = ['terms'=>[