x

@@ -192,8 +192,8 @@ class MailListV2 extends Base {
 
         if($subject || $from_not_in_like){
             $sql .= ' and (';
-            if($subject) $sql.= implode(' and ',$subject);
-            if($from_not_in_like) $sql.= ' and '.implode(' and ',$from_not_in_like);
+            if($subject) $sql.= implode(empty($is_auto_inbox)?' and ':' or ',$subject);
+            if($from_not_in_like) $sql.= ' and ('.implode(empty($is_auto_inbox)?' and ':' or ',$from_not_in_like).')';
             $sql .= ')';
         }
 
@@ -247,9 +247,9 @@ class MailListV2 extends Base {
         $where = ['email_id'=>$emails];
         $where['deleted']   =   0; //未删状态
         // 屏蔽哪些邮件
-        $where['from.notin'] = $this->from_not_in();
-        $where['_'] = "`from` not like 'postmaster@%'";
-        if(!$where['from.notin']) unset($where['from.notin']);
+//        $where['from.notin'] = $this->from_not_in();
+//        $where['_'] = "`from` not like 'postmaster@%'";
+//        if(!$where['from.notin']) unset($where['from.notin']);
 
         // 发件箱
         if(in_array('hot_send',$show_count_filed)){
@@ -301,8 +301,8 @@ class MailListV2 extends Base {
 
             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);
+                if($subject) $sql.= implode(empty($is_auto_inbox)?' and ':' or ',$subject);
+                if($from_not_in_like) $sql.= ' and ('.implode(empty($is_auto_inbox)?' and ':' or ',$from_not_in_like).')';
                 $sql .= ') and ';
             }