bunding

application/models/DAO/PBundling.php

@@ -46,9 +46,9 @@ class PBundlingModel extends \DAO\AbstractModel {
         if(is_array($where)){
             $where = $this->db->getSqlWhereByArray($where);
         }
-        $this->db->select($field)->from($this->_tableName)->where($where)->where("bl_quota_starttime <= ".time())->where('bl_quota_endtime >= '.time())->where('bl_state=1');
+        $this->db->select($field)->from($this->_tableName)->where($where);
         if($isDel==\Our\ApiConst::zero){
-            $this->db->where('is_del=0');
+            $this->db->where('is_del=0')->where("bl_quota_starttime <= ".time())->where('bl_quota_endtime >= '.time())->where('bl_state=1');
         }
         if($limit){
             $this->db->limit($limit[0],$limit[1]);