diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index c89d06dc9..7d0a4cb7e 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -123,18 +123,13 @@ class MemberController extends ThinkController
             unset($_REQUEST['status']);
         }
 
-        $game_map = "";
-        if (!empty($_REQUEST['game_name']) || !empty($_REQUEST['game_type'])) {
-            $game_map .= " and tab_user_play.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
-        }
-        
-        $spendprom .= " and ss.game_id in (".implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')).")";
-        if (isset($_REQUEST['server_name'])) {
-            $spendprom .=  " and ss.server_name like '{$_REQUEST['server_name']}%' ";
-        }
-        $game_play_map = '';
+
+        // if (isset($_REQUEST['game_name'])) {
+        //     //$game_map .= " and tab_user_play.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
+        // }
+        $spendprom = " and ss.game_id in (".implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')).")";
         if (isset($_REQUEST['server_name'])) {
-            $game_play_map .= " and tab_user_play_info.server_name = '{$_REQUEST['server_name']}' ";
+            $map['server_name'] = ['like', "{$_REQUEST['server_name']}%"];
         }
 
         if (isset($_REQUEST['viplevel'])) {
@@ -193,8 +188,6 @@ class MemberController extends ThinkController
         if($_REQUEST['promote_id'] && $_REQUEST['promote_id'] > -1){
             $data = $usermodel->table('(' . $sql1 . ') as a ')->field('a.id,a.device_number,a.age_status,a.account,a.balance,a.gold_coin,a.alipay,a.promote_id,a.register_type,a.promote_account,a.register_time,a.lock_status,a.register_way,a.register_type,a.register_ip,a.login_time,IFNULL(sum(ss.pay_amount),0) as recharge_total,check_status')
             ->join('left join  tab_spend as ss on ss.user_id=a.id AND ss.pay_status = 1'.$spendprom)
-            ->join($game_map ? "tab_user_play on tab_user_play.user_id = a.id $game_map" : false)
-            ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = a.id $game_play_map" : false)
             ->page($page, $row)
             ->having($havs)
             ->group('a.id')
@@ -204,8 +197,6 @@ class MemberController extends ThinkController
         }else{
             $data = $usermodel->table('(' . $sql1 . ') as a ')->field('a.id,a.device_number,a.age_status,a.account,a.balance,a.gold_coin,a.alipay,a.promote_id,a.register_type,a.promote_account,a.register_time,a.lock_status,a.register_way,a.register_type,a.register_ip,a.login_time,IFNULL(sum(ss.pay_amount),0) as recharge_total,check_status')
             ->join('left join  tab_spend as ss on ss.user_id=a.id AND ss.pay_status = 1')
-            ->join($game_map ? "tab_user_play on tab_user_play.user_id = a.id $game_map" : false)
-            ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = a.id $game_play_map" : false)
             ->page($page, $row)
             ->having($havs)
             ->group('a.id')
@@ -217,8 +208,6 @@ class MemberController extends ThinkController
         //计数
         $sql = M('user', 'tab_')->field('tab_user.id,IFNULL(sum(ss.pay_amount),0) AS recharge_total')
             ->join('left join  tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1'.$spendprom)
-            ->join($game_map ? "tab_user_play on tab_user_play.user_id = tab_user.id $game_map" : false)
-            ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = tab_user.id $game_play_map" : false)
             ->where($map)
             ->group('tab_user.id')
             ->where($hav)
@@ -233,8 +222,6 @@ class MemberController extends ThinkController
         if($_REQUEST['promote_id'] && $_REQUEST['promote_id'] > -1){
             $sql = M('user', 'tab_')->field('tab_user.id,IFNULL(sum(ss.pay_amount),0) AS recharge_total')
             ->join('left join  tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1'.$spendprom)
-            ->join($game_map ? "tab_user_play on tab_user_play.user_id = tab_user.id $game_map" : false)
-            ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = tab_user.id $game_play_map" : false)
             ->where($map)
             ->group('tab_user.id')
             ->where($hav)
@@ -793,7 +780,6 @@ class MemberController extends ThinkController
         }
         // $map['type'] = 1;
         // $map['login_time'] = ['exp', 'login_time<>0'];
-//        $map['login_time'] = ['gt',0];
         $extend = array();
         $extend['map'] = $map;
 
@@ -1255,8 +1241,6 @@ class MemberController extends ThinkController
                 }
                 if ($type == 2 && !preg_match("/(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/i", $tag)) {
                     return $this->error("请填写正确的ip信息，如127.0.0.1");
-                } else if ($type == 1 && preg_match("/(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/i", $tag)) {
-                    return $this->error("请填写正确的设备号信息");
                 }
                 $map['type'] = $type;
                 $map['tag'] = $tag;