x

@@ -194,6 +194,13 @@ class MailListV2 extends Base {
 
 
         /************ 2024-09-02 *************/
         /************ 2024-09-02 *************/
         if($folder=='收件箱' && empty($where['flagged'])) {
         if($folder=='收件箱' && empty($where['flagged'])) {
+
+            $sql = "select %s from `lists` left join `lists_auto` on `lists`.`id`= `lists_auto`.`list_id` where ".dbWhere($where);
+            if(!empty($is_auto_inbox)){
+                $sql.= ' and `lists_auto`.`list_id` IS NOT NULL';
+            }else{
+                $sql.= ' and `lists_auto`.`list_id` IS NULL';
+
                 // 模糊标题搜索
                 // 模糊标题搜索
                 $subject = app()->request('subject');
                 $subject = app()->request('subject');
                 if ($subject) {
                 if ($subject) {
@@ -217,6 +224,9 @@ class MailListV2 extends Base {
                     if ($from_not_in_like) $sql .= ' and (' . implode(empty($is_auto_inbox) ? ' and ' : ' or ', $from_not_in_like) . ')';
                     if ($from_not_in_like) $sql .= ' and (' . implode(empty($is_auto_inbox) ? ' and ' : ' or ', $from_not_in_like) . ')';
                     $sql .= ')';
                     $sql .= ')';
                 }
                 }
+
+            }
+
         }
         }
 
 
         /************ 2024-09-02 *************/
         /************ 2024-09-02 *************/
@@ -301,6 +311,7 @@ class MailListV2 extends Base {
         // 收件箱
         // 收件箱
         $where['folder_id'] = $this->getFolderId('收件箱');
         $where['folder_id'] = $this->getFolderId('收件箱');
         $where['is_hots'] = 0;
         $where['is_hots'] = 0;
+        $sql = "select count(*) from `lists` left join `lists_auto` on `lists`.`id`= `lists_auto`.`list_id` where `lists_auto`.`list_id` IS NULL and ";
 
 
         // 模糊标题搜索
         // 模糊标题搜索
         $subject = app()->request('subject');
         $subject = app()->request('subject');
@@ -336,6 +347,10 @@ class MailListV2 extends Base {
             $seenCount = db()->cache($this->cache)->count($sql . dbWhere($where));
             $seenCount = db()->cache($this->cache)->count($sql . dbWhere($where));
             unset($where['seen']);
             unset($where['seen']);
         }
         }
+
+
+
+
         // 星标
         // 星标
         if(in_array('flagged',$show_count_filed)) {
         if(in_array('flagged',$show_count_filed)) {
             $where['flagged'] = 1;
             $where['flagged'] = 1;