|
|
|
@ -130,10 +130,10 @@ class QueryController extends BaseController
|
|
|
|
|
$list['p_p_pro_real_name'] = $list['pro_real_name'];
|
|
|
|
|
$list['p_pro_account'] = $list['pro_account'];
|
|
|
|
|
$list['p_pro_real_name'] = $list['pro_real_name'];
|
|
|
|
|
if(!empty($list['chain'])) {
|
|
|
|
|
$chain = trim($list['chain'],'/');
|
|
|
|
|
if (!empty($list['chain'])) {
|
|
|
|
|
$chain = trim($list['chain'], '/');
|
|
|
|
|
$chainArr = explode('/', $chain);
|
|
|
|
|
if(!empty($chainArr[1])) {
|
|
|
|
|
if (!empty($chainArr[1])) {
|
|
|
|
|
$thisPromoteData1 = D('Promote')
|
|
|
|
|
->field('account,real_name')
|
|
|
|
|
->where(array('id' => $chainArr[1]))
|
|
|
|
@ -141,7 +141,7 @@ class QueryController extends BaseController
|
|
|
|
|
$list['p_p_pro_account'] = $thisPromoteData1['account']; //部门长
|
|
|
|
|
$list['p_p_pro_real_name'] = $thisPromoteData1['real_name'];
|
|
|
|
|
}
|
|
|
|
|
if(!empty($chainArr[2])) {
|
|
|
|
|
if (!empty($chainArr[2])) {
|
|
|
|
|
$thisPromoteData2 = D('Promote')
|
|
|
|
|
->field('account,real_name')
|
|
|
|
|
->where(array('id' => $chainArr[2]))
|
|
|
|
@ -1055,7 +1055,7 @@ class QueryController extends BaseController
|
|
|
|
|
{
|
|
|
|
|
$relationGameId = intval(I('relation_game_id', 0));
|
|
|
|
|
$sdkVersion = intval(I('sdk_version', 0));
|
|
|
|
|
$serverId = intval(I('server_id'), 0);
|
|
|
|
|
$serverId = I('server_id', '');
|
|
|
|
|
$nowTime = date('Y-m-d');
|
|
|
|
|
$initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
|
|
|
|
|
$initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
|
|
|
|
@ -1095,7 +1095,7 @@ class QueryController extends BaseController
|
|
|
|
|
$params['game_id'] = ['in', $gameIds];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ($serverId > 0) {
|
|
|
|
|
if (!empty($serverId)) {
|
|
|
|
|
$params['server_id'] = $serverId;
|
|
|
|
|
}
|
|
|
|
|
$params['begin_time'] = $begTime;
|
|
|
|
@ -1215,7 +1215,7 @@ class QueryController extends BaseController
|
|
|
|
|
$ownId = intval(I('own_id'), 0);//本账号
|
|
|
|
|
$relationGameId = intval(I('relation_game_id', 0));
|
|
|
|
|
$sdkVersion = intval(I('sdk_version', 0));
|
|
|
|
|
$serverId = intval(I('server_id'), 0);
|
|
|
|
|
$serverId = I('server_id', '');
|
|
|
|
|
$nowTime = date('Y-m-d');
|
|
|
|
|
$initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
|
|
|
|
|
$initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
|
|
|
|
@ -1261,7 +1261,7 @@ class QueryController extends BaseController
|
|
|
|
|
$map['a.sdk_version'] = $sdkVersion;
|
|
|
|
|
}
|
|
|
|
|
$serverJoin = '';
|
|
|
|
|
if ($serverId > 0) {
|
|
|
|
|
if (!empty($serverId)) {
|
|
|
|
|
$serverJoin = 'tab_server as s on s.game_id = a.game_id';
|
|
|
|
|
$map['s.server_id'] = $serverId;
|
|
|
|
|
$params['server_id'] = $serverId;
|
|
|
|
@ -2085,7 +2085,7 @@ class QueryController extends BaseController
|
|
|
|
|
$this->assign('subPromotes', $subPromotes);
|
|
|
|
|
$this->assign('records', $records);
|
|
|
|
|
$this->assign('pagination', $pagination);
|
|
|
|
|
$this->assign('parentid',$parentId);
|
|
|
|
|
$this->assign('parentid', $parentId);
|
|
|
|
|
$this->assign('count', $count);
|
|
|
|
|
$this->display();
|
|
|
|
|
}
|
|
|
|
|