From d5d6f3fd86fa79257da6f1d23a1f5d53b5cca70f Mon Sep 17 00:00:00 2001 From: wlx Date: Tue, 21 Dec 2010 03:53:40 +0000 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E4=BA=86=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E8=AE=A1=E5=85=A5=E9=99=90=E5=88=B6=E8=8C=83=E5=9B=B4=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/default/controllers/DataController.php | 2 +- application/default/controllers/WaterController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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";