优化用户列表选择设备无响应问题

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();