|
|
|
@ -31,10 +31,10 @@ class TestResourceController extends BaseController
|
|
|
|
|
$map['tab_test_resource.role_name']=['like','%'.I('role_name').'%'];
|
|
|
|
|
}
|
|
|
|
|
if(!empty(I('user_account'))){
|
|
|
|
|
$map['tab_test_resource.user_account']=I('user_account');
|
|
|
|
|
$map['tab_test_resource.user_account']=['like','%'.I('user_account').'%'];
|
|
|
|
|
}
|
|
|
|
|
if(!empty(I('promote_name'))){
|
|
|
|
|
$map['tab_test_resource.promote_account']=I('promote_name');
|
|
|
|
|
$map['tab_test_resource.promote_account']=['like','%'.I('promote_name').'%'];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$map['user.promote_id']=session("promote_auth.pid");
|
|
|
|
@ -282,6 +282,9 @@ class TestResourceController extends BaseController
|
|
|
|
|
$map['create_time'] = array('BETWEEN',array(strtotime($_REQUEST['start']),strtotime($_REQUEST['end'])+24*60*60-1));
|
|
|
|
|
unset($_REQUEST['start']);unset($_REQUEST['end']);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$map['test.promote_id'] = get_pid();
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
$res = D("test_resource")->getResourceCout($map,$page,$row);
|
|
|
|
|
// dump($res);
|
|
|
|
|