bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

通过了离线申请的数据不再计入限制范围内

This commit is contained in:
wlx 2010-12-21 03:53:40 +00:00
parent 7a67f4d24c
commit d5d6f3fd86
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/default/controllers/DataController.php
View File

@ -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";

2
application/default/controllers/WaterController.php
View File

@ -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";