|
|
@ -1298,9 +1298,9 @@ class QueryController extends BaseController
|
|
|
|
$parameter['own_id'] = $ownId;
|
|
|
|
$parameter['own_id'] = $ownId;
|
|
|
|
$parameter['p'] = $page;
|
|
|
|
$parameter['p'] = $page;
|
|
|
|
$parameter['row'] = $row;
|
|
|
|
$parameter['row'] = $row;
|
|
|
|
|
|
|
|
|
|
|
|
$loginPromote = $this->getLoginPromote();
|
|
|
|
$loginPromote = $this->getLoginPromote();
|
|
|
|
|
|
|
|
|
|
|
|
$map = [];
|
|
|
|
$map = [];
|
|
|
|
$map = ['_string' => '1=1'];
|
|
|
|
$map = ['_string' => '1=1'];
|
|
|
|
if ($ownId) {
|
|
|
|
if ($ownId) {
|
|
|
@ -1323,7 +1323,7 @@ class QueryController extends BaseController
|
|
|
|
|
|
|
|
|
|
|
|
$params['begin_time'] = $begTime;
|
|
|
|
$params['begin_time'] = $begTime;
|
|
|
|
$params['end_time'] = $endTime - 1;
|
|
|
|
$params['end_time'] = $endTime - 1;
|
|
|
|
|
|
|
|
|
|
|
|
$promoteService = new PromoteService();
|
|
|
|
$promoteService = new PromoteService();
|
|
|
|
$allGameIs = $promoteService->getHistoryGameIds($loginPromote);
|
|
|
|
$allGameIs = $promoteService->getHistoryGameIds($loginPromote);
|
|
|
|
if ($allGameIs && count($allGameIs) > 0) {
|
|
|
|
if ($allGameIs && count($allGameIs) > 0) {
|
|
|
@ -1334,7 +1334,6 @@ class QueryController extends BaseController
|
|
|
|
|
|
|
|
|
|
|
|
$data = M('game', 'tab_')->where($map)->order('sort desc,id desc')->page($page, $row)->select();
|
|
|
|
$data = M('game', 'tab_')->where($map)->order('sort desc,id desc')->page($page, $row)->select();
|
|
|
|
$count = M('game', 'tab_')->where($map)->count();
|
|
|
|
$count = M('game', 'tab_')->where($map)->count();
|
|
|
|
|
|
|
|
|
|
|
|
$records = [];
|
|
|
|
$records = [];
|
|
|
|
$allData = [];
|
|
|
|
$allData = [];
|
|
|
|
if (!empty($data)) {
|
|
|
|
if (!empty($data)) {
|
|
|
|