x

@@ -143,6 +143,7 @@ class MailListV2 extends Base {
         if($folder=='星标邮件'||$folder=='Starred'){
         if($folder=='星标邮件'||$folder=='Starred'){
             $folder = '收件箱';
             $folder = '收件箱';
             $where['flagged'] = 1; // 星标
             $where['flagged'] = 1; // 星标
+            unset($where['is_hots']);
         }elseif ($folder=='预热收件箱'){
         }elseif ($folder=='预热收件箱'){
             $folder = '收件箱';
             $folder = '收件箱';
             $where['is_hots'] = 1;
             $where['is_hots'] = 1;
@@ -192,7 +193,7 @@ class MailListV2 extends Base {
         $sql = "select %s from `lists` where ".dbWhere($where);
         $sql = "select %s from `lists` where ".dbWhere($where);
 
 
         /************ 2024-09-02 *************/
         /************ 2024-09-02 *************/
-        if($folder=='收件箱') {
+        if($folder=='收件箱' && empty($where['flagged'])) {
             // 模糊标题搜索
             // 模糊标题搜索
             $subject = app()->request('subject');
             $subject = app()->request('subject');
             if ($subject) {
             if ($subject) {
@@ -340,7 +341,8 @@ class MailListV2 extends Base {
             $where['flagged'] = 1;
             $where['flagged'] = 1;
             unset($where['folder_id']);
             unset($where['folder_id']);
             $where['email_id'] = $emails;
             $where['email_id'] = $emails;
-            $flaggedCount = db()->cache($this->cache)->count($sql . dbWhere($where));
+            unset($where['is_hots']);
+            $flaggedCount = db()->cache($this->cache)->count("select count(*) from `lists` where " . dbWhere($where));
         }
         }
 
 
         $data = [];
         $data = [];