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

修改bug

Application/Admin/Controller/ExportController.class.php

@@ -8281,14 +8281,16 @@ class ExportController extends Controller
 
         $searchGameIds = null;
         $game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id');
+        $gameWhere = [];
         if ($game_ids) {
             $map['s.game_id'] = ['in', $game_ids];
-            $searchGameIds = $game_ids;
+            $gameWhere['id'] = ['in', $game_ids];
         }
 
 
         if (!empty(I('partner_id'))) {
             $map['g.partner_id'] = I('partner_id');
+            $gameWhere['partner_id'] = I('partner_id');
         }
 
         if (!empty(I('timestart'))) {
@@ -8306,8 +8308,10 @@ class ExportController extends Controller
 
         if (!empty(I('game_type_id'))) {
             $map['g.game_type_id'] = I('game_type_id');
-            $searchGameIds = M('game', 'tab_')->where(['game_type_id' => I('game_type_id', 0)])->getField('id', true);
+            $gameWhere['game_type_id'] = I('game_type_id', 0);
         }
+        
+        $searchGameIds = M('game', 'tab_')->where($gameWhere)->getField('id', true);
 
         $xlsData = D("spend")->gameStatistics($map);
 
@@ -8335,6 +8339,7 @@ class ExportController extends Controller
             'started_at' => I('timestart', ''), 
             'ended_at' => I('timeend', ''),
             'search_games' => $searchGameCodes,
+            'device_type' => I("sdk_type", 0),
         ]);
         $aggData = [];
         $aggTotal = '0.00';

Application/Admin/Controller/FinanceController.class.php

@@ -766,6 +766,7 @@ class FinanceController extends ThinkController
             'started_at' => I('timestart', ''),
             'ended_at' => I('timeend', ''),
             'search_games' => $searchGameCodes,
+            'device_type' => I("sdk_type", 0),
         ]);
         $aggData = [];
         $aggTotal = '0.00';