Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/testing_game_server

Application/Home/Controller/DownloadController.class.php

@@ -2067,7 +2067,7 @@ class DownloadController extends BaseController
             $map['create_time'] = ['between', [$createTimeBegin, $createTimeEnd]];
         }
         if ($isSelf) {
-            $map['promote_id'] = $queryPromote['id'];
+            $map['role.promote_id'] = $queryPromote['id'];
         }
 
         $orderBy = 'create_time desc';

Application/Home/View/default/TestingResource/batches.html

@@ -84,7 +84,7 @@
                     <select id="server_id" name="server_id" class="reselect select_gallery"  style="width:101px">
                       <option server-id="0" value="">请选择区服</option>
                       <?php foreach($servers as $server):?>
-                      <option server-id="<?=$server['server_id']?>" value="<?=$servers['server_id']?>" <?php if($servers['server_id'] == I('server_id')):?>selected="selected"<?php endif;?>>
+                      <option server-id="<?=$server['server_id']?>" value="<?=$server['id']?>" <?php if($server['id'] == I('server_id')):?>selected="selected"<?php endif;?>>
                           <?=$server['server_name']?>
                       </option>
                       <?php endforeach;?>
@@ -280,7 +280,7 @@ $("#submit").click(function(){
           var servers = result.data.servers
           var str = "<option value=''>请选择区服</option>"
           for (var i in servers){
-            str += "<option value='"+servers[i].server_name+"'>"+servers[i].server_name+"</option>"
+            str += "<option value='"+servers[i].id+"'>"+servers[i].server_name+"</option>"
           }
           $("#server_id").empty()
           $("#server_id").append(str)