From 12f00ad2680829c3de2792ae83ba9c9710eb9db7 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Fri, 27 Dec 2019 11:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/StatisticsController.class.php    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/StatisticsController.class.php b/Application/Admin/Controller/StatisticsController.class.php
index d7b4b3765..5bb786fd6 100644
--- a/Application/Admin/Controller/StatisticsController.class.php
+++ b/Application/Admin/Controller/StatisticsController.class.php
@@ -1035,15 +1035,17 @@ class StatisticsController extends ThinkController {
 
 		$map = " 1=1 ";
 		$game_map = "";
-		if (isset($_REQUEST['game_name'])) {
+		if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) {
 			$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
 			$map .= " AND game_id in ({$game_ids})";
 			$game_map = " AND EXISTS (SELECT upi.user_id FROM  tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
 			if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' ";
 			$game_map .= ") ";
-		}
-		if (isset($_REQUEST['server_name'])) {
-            $map .= " AND server_name = '{$_REQUEST['server_name']}' ";
+		} else if (isset($_REQUEST['game_name'])) {
+            $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
+			$map .= " AND game_id in ({$game_ids})";
+			$game_map = " AND EXISTS (SELECT upi.user_id FROM  tab_user_play as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
+			$game_map .= ") ";
 		}
 		// 获取包含的用户id
 		$users = M()->query("