diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php index 180268bd..8272052d 100755 --- a/application/default/controllers/DataController.php +++ b/application/default/controllers/DataController.php @@ -800,7 +800,7 @@ class DataController extends Zend_Controller_Action // 10:离线申请完成? // -1: 取消了在线下载进程 //首先判断离线申请的数据数量是否超过系统限制 - $sql="select count(*) as datacount from dataorder where (ts_approved is null) and userid=? and status>0 and status<6"; + $sql="select count(*) as datacount from dataorder where (ts_approved is null) and userid=? and status>0 and status<5"; $r=$this->db->fetchRow($sql,array($userid)); //保证添加的离线数据申请未申请 $sql="select count(*) as datacount from dataorder where (ts_approved is null) and userid=? and uuid=? and status=1"; diff --git a/application/default/controllers/WaterController.php b/application/default/controllers/WaterController.php index beb8d688..928d720d 100644 --- a/application/default/controllers/WaterController.php +++ b/application/default/controllers/WaterController.php @@ -314,7 +314,7 @@ class WaterController extends DataController // 10:离线申请完成? // -1: 取消了在线下载进程 //首先判断离线申请的数据数量是否超过系统限制 - $sql="select count(*) as datacount from dataorder where (ts_approved is null) and userid=? and status>0 and status<6"; + $sql="select count(*) as datacount from dataorder where (ts_approved is null) and userid=? and status>0 and status<5"; $r=$this->db->fetchRow($sql,array($userid)); //保证添加的离线数据申请未申请 $sql="select count(*) as datacount from dataorder where (ts_approved is null) and userid=? and uuid=? and status=1";