作者 张关杰

serve

@@ -67,7 +67,7 @@ class MailListV2Es2 extends Base { @@ -67,7 +67,7 @@ class MailListV2Es2 extends Base {
67 } 67 }
68 68
69 69
70 -// $where['is_hots'] = 0; 70 + $where['is_hots'] = 0;
71 // 项目id 71 // 项目id
72 $where['postid'] = intval(app()->request('postid',-1)); 72 $where['postid'] = intval(app()->request('postid',-1));
73 $where['folder_as_int'] = 404; // 搜索那个文件夹 73 $where['folder_as_int'] = 404; // 搜索那个文件夹
@@ -437,8 +437,9 @@ class MailListV2Es2 extends Base { @@ -437,8 +437,9 @@ class MailListV2Es2 extends Base {
437 if($seen!==null){ 437 if($seen!==null){
438 $body['query']['bool']['must'][] = ['term'=>['seen'=>$seen]]; 438 $body['query']['bool']['must'][] = ['term'=>['seen'=>$seen]];
439 } 439 }
440 - if(in_array($folder,['收件箱','发件箱'])) 440 +
441 $body['query']['bool']['must'][] = ['term'=>['is_hots'=>0]]; 441 $body['query']['bool']['must'][] = ['term'=>['is_hots'=>0]];
  442 +
442 $body['query']['bool']['must'][] = ['term'=>['folder_as_int'=>folder2int($folder)]]; 443 $body['query']['bool']['must'][] = ['term'=>['folder_as_int'=>folder2int($folder)]];
443 if($this->assignSql($folder)) $body['query']['bool']['must'][] = $this->assignSql($folder); 444 if($this->assignSql($folder)) $body['query']['bool']['must'][] = $this->assignSql($folder);
444 // logs('count :'.json_encode($body)); 445 // logs('count :'.json_encode($body));