master
ELF 4 years ago
parent 9483e4b7b3
commit 1b74318619

@ -1247,9 +1247,10 @@ class PromoteService {
$map = []; $map = [];
$map['_string'] = ' promote_id in(' . $this->subInSql($topPromote) . ')'; $map['_string'] = ' promote_id in(' . $this->subInSql($topPromote) . ')';
$map = $spendRepository->withIsCheck($map); $map = $spendRepository->withIsCheck($map);
$historyGameIds = M('spend', 'tab_')->field(['distinct game_id'])->where($map)->getField('game_id', true); $historyGames = M('spend', 'tab_')->field(['distinct game_id'])->where($map)->select();
if (!$historyGameIds) {
$historyGameIds = []; $historyGameIds = [];
if ($historyGames) {
$historyGameIds = array_column($historyGames, 'game_id');
} }
$nowGameIds = $topPromote['game_ids'] == '' ? [] : explode(',', $topPromote['game_ids']); $nowGameIds = $topPromote['game_ids'] == '' ? [] : explode(',', $topPromote['game_ids']);
return array_unique(array_merge($historyGameIds, $nowGameIds)); return array_unique(array_merge($historyGameIds, $nowGameIds));

@ -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)) {

Loading…
Cancel
Save