Merge branch 'hotfix/promote_sum' of wmtx/platform into master

修改

Application/Base/Service/PromoteService.class.php

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

Application/Home/Controller/QueryController.class.php

@@ -1334,7 +1334,6 @@ class QueryController extends BaseController
         
         $data = M('game', 'tab_')->where($map)->order('sort desc,id desc')->page($page, $row)->select();
         $count = M('game', 'tab_')->where($map)->count();
-
         $records = [];
         $allData = [];
         if (!empty($data)) {