作者 邓超

优化我的邮件查询

@@ -52,9 +52,11 @@ class HomeEs extends Base { @@ -52,9 +52,11 @@ class HomeEs extends Base {
52 } 52 }
53 53
54 // 附件 54 // 附件
55 - $attachment = app()->request('attachment',0,'bool_Val'); 55 + $attachment = app()->request('attachment',-1,'intval');
56 // 已读/未读 56 // 已读/未读
57 $seen = app()->request('seen',-1,'intval'); 57 $seen = app()->request('seen',-1,'intval');
  58 + // 星标
  59 + $flagged = app()->request('flagged',-1,'intval');
58 // 软删 60 // 软删
59 $deleted = app()->request('deleted',0,'intval'); 61 $deleted = app()->request('deleted',0,'intval');
60 62
@@ -103,9 +105,9 @@ class HomeEs extends Base { @@ -103,9 +105,9 @@ class HomeEs extends Base {
103 } 105 }
104 106
105 107
106 - if(paramHas('attachment')){ //附件 108 + if(in_array($attachment,[0,1])){ //附件
107 $query['query']['bool']['must'][] = ['term'=>[ 109 $query['query']['bool']['must'][] = ['term'=>[
108 - 'is_file'=>$attachment ? 1 : 0 110 + 'is_file'=>$attachment
109 ]]; 111 ]];
110 } 112 }
111 // 软删 113 // 软删
@@ -114,14 +116,21 @@ class HomeEs extends Base { @@ -114,14 +116,21 @@ class HomeEs extends Base {
114 ]]; 116 ]];
115 117
116 // 已读/未读 118 // 已读/未读
117 - if(paramHas('seen')){  
118 - if(in_array($seen,[0,1])){  
119 - $query['query']['bool']['must'][] = ['term'=>[  
120 - 'seen'=>$seen  
121 - ]];  
122 - } 119 + if(in_array($seen,[0,1])){
  120 + $query['query']['bool']['must'][] = ['term'=>[
  121 + 'seen'=>$seen
  122 + ]];
123 } 123 }
124 124
  125 +
  126 + // 星标
  127 + if(in_array($flagged,[0,1])){
  128 + $query['query']['bool']['must'][] = ['term'=>[
  129 + 'flagged'=>$flagged
  130 + ]];
  131 + }
  132 +
  133 +
125 $where['_'] = []; 134 $where['_'] = [];
126 // 搜索关键字 135 // 搜索关键字
127 $keyword = app()->request('keyword','',['htmlspecialchars','addslashes']); 136 $keyword = app()->request('keyword','',['htmlspecialchars','addslashes']);