x

@@ -281,6 +281,32 @@ class MailListV2 extends Base {
         if(in_array('inbox',$show_count_filed)) {
             $where['folder_id'] = $this->getFolderId('收件箱');
             $where['is_hots'] = 0;
+
+            // 模糊标题搜索
+            $subject = app()->request('subject');
+            if($subject){
+                $subject = is_array($subject) ? $subject : [$subject];
+                foreach ($subject as $k=>$sub){
+                    $subject[$k] = '`subject` '.(empty($is_auto_inbox)?' not ':'').'like "%%'.addslashes($sub).'%%"';
+                }
+            }
+            // 不在此邮箱中的
+            $from_not_in_like = app()->request('from_not_in_like');
+            if($from_not_in_like){
+                $from_not_in_like = is_array($from_not_in_like) ? $from_not_in_like : [$from_not_in_like];
+                foreach ($from_not_in_like as $k=>$sub){
+                    $from_not_in_like[$k] = '`from` '.(empty($is_auto_inbox)?' not ':'').'like "%%'.addslashes($sub).'%%"';
+                }
+            }
+
+            if($subject || $from_not_in_like){
+                $sql .= ' (';
+                if($subject) $sql.= implode(' and ',$subject);
+                if($from_not_in_like) $sql.= ' and '.implode(' and ',$from_not_in_like);
+                $sql .= ') and ';
+            }
+
+
             $shouCount = db()->cache($this->cache)->count($sql . dbWhere($where));
         }
         // 未读