优化我的邮件查询

@@ -52,9 +52,11 @@ class HomeEs extends Base {
         }
         }
 
 
         // 附件
         // 附件
-        $attachment =   app()->request('attachment',0,'bool_Val');
+        $attachment =   app()->request('attachment',-1,'intval');
         // 已读/未读
         // 已读/未读
         $seen =   app()->request('seen',-1,'intval');
         $seen =   app()->request('seen',-1,'intval');
+        // 星标
+        $flagged =   app()->request('flagged',-1,'intval');
         // 软删
         // 软删
         $deleted =   app()->request('deleted',0,'intval');
         $deleted =   app()->request('deleted',0,'intval');
 
 
@@ -103,9 +105,9 @@ class HomeEs extends Base {
         }
         }
 
 
 
 
-        if(paramHas('attachment')){ //附件
+        if(in_array($attachment,[0,1])){ //附件
             $query['query']['bool']['must'][] = ['term'=>[
             $query['query']['bool']['must'][] = ['term'=>[
-                'is_file'=>$attachment ? 1 : 0
+                'is_file'=>$attachment
             ]];
             ]];
         }
         }
         // 软删
         // 软删
@@ -114,14 +116,21 @@ class HomeEs extends Base {
         ]];
         ]];
 
 
         // 已读/未读
         // 已读/未读
-        if(paramHas('seen')){
         if(in_array($seen,[0,1])){
         if(in_array($seen,[0,1])){
             $query['query']['bool']['must'][] = ['term'=>[
             $query['query']['bool']['must'][] = ['term'=>[
                 'seen'=>$seen
                 'seen'=>$seen
             ]];
             ]];
         }
         }
+
+
+        // 星标
+        if(in_array($flagged,[0,1])){
+            $query['query']['bool']['must'][] = ['term'=>[
+                'flagged'=>$flagged
+            ]];
         }
         }
 
 
+
         $where['_'] = [];
         $where['_'] = [];
         // 搜索关键字
         // 搜索关键字
         $keyword = app()->request('keyword','',['htmlspecialchars','addslashes']);
         $keyword = app()->request('keyword','',['htmlspecialchars','addslashes']);