From 4d070462ac2a8b97bd18abcf23edf13f9e12adba Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Tue, 17 Dec 2019 12:33:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC=E7=8E=A9?=
 =?UTF-8?q?=E5=AE=B6--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/QueryController.class.php    | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 63e44c57b..6f07d8ae2 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1782,16 +1782,13 @@ class QueryController extends BaseController
             $ids[] = $queryPromote['id'];
 
             $map = ['uc.promote_id' => ['in', $ids]];
-            $subMap = ['promote_id' => ['in', $ids]];
 
             if ($relationGameId != 0 || $sdkVersion != 0) {
                 $gameIds = gameSearch($relationGameId, $sdkVersion);
                 $map['uc.game_id'] = ['in', $gameIds];
-                $subMap['game_id'] = ['in', $gameIds];
             }
             if ($serverId != 0) {
                 $map['uc.server_id'] = $serverId;
-                $subMap['server_id'] = $serverId;
             }
             if ($roleName != '') {
                 $map['ui.role_name'] = ['like', $roleName . '%'];
@@ -1857,9 +1854,9 @@ class QueryController extends BaseController
             $field = $fieldUC . ',' . $fieldUI . ',' . $fieldLR . ' as user_game_login_count';
             $subQuery = M('user_play_data_count', 'tab_')->alias('uc')
                 ->field($field)
-                ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.role_id = uc.role_id')
+                ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
                 ->where($map)
-                ->group('uc.role_id,uc.game_id,uc.user_id')
+                ->group('uc.role_id,uc.server_id,uc.game_id')
                 ->buildSql();
             $query = M()->alias('record')
                 ->table($subQuery)
@@ -1867,15 +1864,10 @@ class QueryController extends BaseController
 
             list($records, $pagination, $count) = $this->paginate($query);
 
-            $totalQuery = M('user_play_data_count', 'tab_')->alias('uc')
+            $total = M('user_play_data_count', 'tab_')->alias('uc')
                 ->field($fieldUC)
-                ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and uc.server_id = ui.server_id and ui.role_id = uc.role_id')
-                ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id')
+                ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
                 ->where($map)
-                ->buildSql();
-            $total = M()->alias('totals')
-                ->table($totalQuery)
-                ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today')
                 ->find();
 
             foreach ($records as &$list) {