fob

@@ -130,7 +130,7 @@ class MailList extends Base {
             $sql = "select %s from `lists` left join `fob_hot_mail` on `lists`.`id` = `fob_hot_mail`.`lists_id` where `fob_hot_mail`.`folder` = '{$extSql}' and ".dbWhere($where);
             $sql = "select %s from `lists` left join `fob_hot_mail` on `lists`.`id` = `fob_hot_mail`.`lists_id` where `fob_hot_mail`.`folder` = '{$extSql}' and ".dbWhere($where);
         }else{
         }else{
             if($folder == '收件箱' || $folder == '发件箱'){
             if($folder == '收件箱' || $folder == '发件箱'){
-                $sql = "select %s from `lists` left join `fob_hot_mail` on `lists`.`id` = `fob_hot_mail`.`lists_id` where ISNULL(`lists_id`) ".dbWhere($where);
+                $sql = "select %s from `lists` left join `fob_hot_mail` on `lists`.`id` = `fob_hot_mail`.`lists_id` where ISNULL(`lists_id`) and ".dbWhere($where);
             }else{
             }else{
                 $sql = "select %s from `lists` where ".dbWhere($where);
                 $sql = "select %s from `lists` where ".dbWhere($where);
             }
             }
@@ -158,7 +158,7 @@ class MailList extends Base {
                 $v['to_name'] = '';
                 $v['to_name'] = '';
             }
             }
             return $v;
             return $v;
-        },$lists);
+        },$lists?:[]);
 
 
         // 总数
         // 总数
         $total  = db()->count(sprintf($sql,"count(*)"));
         $total  = db()->count(sprintf($sql,"count(*)"));