Merge remote-tracking branch 'origin/dev' into dev

Application/Admin/Controller/MemberController.class.php

@@ -124,8 +124,10 @@ class MemberController extends ThinkController
         }
 
         $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']}%' ";

Application/Home/Controller/DownloadController.class.php

@@ -2857,7 +2857,7 @@ class DownloadController extends BaseController {
         $field = $fieldUC . ',' . $fieldUI;
         $subQuery = M('user_play_data_count', 'tab_')->alias('uc')
         ->field($field)
-        ->join('tab_user_play_info as ui on ui.promote_id = uc.promote_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
+        ->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)
         ->group('uc.role_id,uc.server_id,uc.game_id')
         ->buildSql();

Application/Home/Controller/QueryController.class.php

@@ -1785,7 +1785,7 @@ class QueryController extends BaseController
                 $map['_string'] = 'ui.role_id in(' . $subQuery . ')';
             }
 
-            $orderBy = 'ui.play_time desc';
+            $orderBy = 'play_time desc';
             if (!empty($sortName)) {
                 if (in_array($sortName, $sortNameData)) {
                     $desc = ' desc';
@@ -1814,7 +1814,7 @@ class QueryController extends BaseController
             $field = $fieldUC . ',' . $fieldUI;
             $subQuery = M('user_play_data_count', 'tab_')->alias('uc')
                 ->field($field)
-                ->join('tab_user_play_info as ui on ui.promote_id = uc.promote_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
+                ->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)
                 ->group('uc.role_id,uc.server_id,uc.game_id')
                 ->buildSql();

Data/update.sql

@@ -559,3 +559,7 @@ ADD COLUMN `promote_id` int(11) NOT NULL DEFAULT 0 COMMENT '推广员ID';
 ALTER TABLE `tab_user_play_data_count`
 DROP INDEX `search`,
 ADD INDEX `search`(`user_id`, `promote_id`, `game_id`, `server_id`, `role_id`, `create_time`) USING BTREE;
+
+--玩家角色表--添加索引
+ALTER TABLE `tab_user_play_info`
+ADD INDEX `game_id`(`game_id`, `server_id`, `role_id`);