x

@@ -150,10 +150,14 @@ class MailListV2 extends Base {
             }
             }
         }
         }
 
 
+        // 星标就不加文件夹赛选
+        if(empty($where['flagged'])){
             $folder_id = $this->getFolderId($folder);
             $folder_id = $this->getFolderId($folder);
 
 
             //目录
             //目录
             $where['folder_id'] = $folder_id;
             $where['folder_id'] = $folder_id;
+        }
+
         if($ids) $where['id'] = $ids;
         if($ids) $where['id'] = $ids;
 
 
         if(app()->request('attachment',0,'bool_Val')){
         if(app()->request('attachment',0,'bool_Val')){
@@ -319,6 +323,7 @@ class MailListV2 extends Base {
         // 星标
         // 星标
         if(in_array('flagged',$show_count_filed)) {
         if(in_array('flagged',$show_count_filed)) {
             $where['flagged'] = 1;
             $where['flagged'] = 1;
+            unset($where['folder_id']);
             $flaggedCount = db()->cache($this->cache)->count($sql . dbWhere($where));
             $flaggedCount = db()->cache($this->cache)->count($sql . dbWhere($where));
         }
         }
         $data = [];
         $data = [];