From 9dcc55d472c67006144716f31814dbab3eddacff Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 24 Dec 2019 10:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=80=89=E6=8B=A9=E8=AE=BE=E5=A4=87=E6=97=A0=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/MemberController.class.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index 47754f345..260683adb 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -83,10 +83,16 @@ class MemberController extends ThinkController
         //1.2 与游戏相关
         $game_map = false;
         if (isset($_REQUEST['game_name']) || isset($_REQUEST['game_type'])) {
+            
             $game_map = " and tab_user_play_info.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
         }
         if (isset($_REQUEST['server_name'])) {
-            $game_map = " and tab_user_play_info.server_name = '{$_REQUEST['server_name']}' ";
+            if($game_map){
+                $game_map .= " and tab_user_play_info.server_name = '{$_REQUEST['server_name']}' ";
+            }else{
+                $game_map = " and tab_user_play_info.server_name = '{$_REQUEST['server_name']}' ";
+            }
+            
         }
         $promoteRoot = getPowerPromoteIds();