diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 9265fe485..2fab1180c 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1963,7 +1963,7 @@ class QueryController extends BaseController $map['sdk_version'] = $sdkVersion; } $gameIds = M('game', 'tab_')->where($map)->getField('id', true); - $servers = M('server', 'tab_')->field(['id', 'server_id', 'server_name'])->where(['game_id' => ['in', $gameIds]])->order('server_id asc')->select(); + $servers = M('server', 'tab_')->field(['id', 'server_id', 'server_name'])->where(['game_id' => ['in', $gameIds]])->group('server_id')->order('server_id asc')->select(); } $this->ajaxReturn([ 'status' => 1, @@ -2234,7 +2234,7 @@ class QueryController extends BaseController $sdkVersion = I('sdk_version', 0); $relationGameId = I('relation_game_id', 0); $serverId = I('server_id', 0); - $parentId = I('parent_id', 0); + $parentId = I('get.parent_id', 0); $promoteId = I('promote_id', 0); $levelBegin = I('level_begin', ''); $levelEnd = I('level_end', ''); diff --git a/Application/Home/View/default/Query/promoteQuota.html b/Application/Home/View/default/Query/promoteQuota.html index f98ada7c1..f4472d115 100644 --- a/Application/Home/View/default/Query/promoteQuota.html +++ b/Application/Home/View/default/Query/promoteQuota.html @@ -26,10 +26,10 @@ {$meta_title}