Commit b3b30b1a by 冷斌

fix bug

parent b7b5c008
......@@ -16,15 +16,20 @@ class DynamicController extends AdminbaseController
{
if($_REQUEST['start_time']!=''){
$map['addtime']=array("gt",strtotime($_REQUEST['start_time']));
$_GET['start_time']=$_REQUEST['start_time'];
}
if($_REQUEST['end_time']!=''){
$map['addtime']=array("lt",strtotime($_REQUEST['end_time']));
$_GET['end_time']=$_REQUEST['end_time'];
}
if($_REQUEST['start_time']!='' && $_REQUEST['end_time']!='' ){
$map['addtime']=array("between",array(strtotime($_REQUEST['start_time']),strtotime($_REQUEST['end_time'])));
$_GET['start_time']=$_REQUEST['start_time'];
$_GET['end_time']=$_REQUEST['end_time'];
}
if($_REQUEST['keyword']!=''){
$map['uid']=array("like","%".$_REQUEST['keyword']."%");
$_GET['keyword']=$_REQUEST['keyword'];
}
$count = $this->dynamic_model->where($map)->count();
$page = $this->page($count, 20);
......@@ -57,15 +62,20 @@ class DynamicController extends AdminbaseController
{
if($_REQUEST['start_time']!=''){
$map['addtime']=array("gt",strtotime($_REQUEST['start_time']));
$_GET['start_time']=$_REQUEST['start_time'];
}
if($_REQUEST['end_time']!=''){
$map['addtime']=array("lt",strtotime($_REQUEST['end_time']));
$_GET['end_time']=$_REQUEST['end_time'];
}
if($_REQUEST['start_time']!='' && $_REQUEST['end_time']!='' ){
$map['addtime']=array("between",array(strtotime($_REQUEST['start_time']),strtotime($_REQUEST['end_time'])));
$_GET['start_time']=$_REQUEST['start_time'];
$_GET['end_time']=$_REQUEST['end_time'];
}
if($_REQUEST['keyword']!=''){
$map['uid']=array("like","%".$_REQUEST['keyword']."%");
$_GET['keyword']=$_REQUEST['keyword'];
}
$report = M("users_report_dynamic");
$count = $report->where($map)->count();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment