From a960ed7c0c7ee18d3be2fe5fc71b60ea69f5e143 Mon Sep 17 00:00:00 2001
From: liyang <316606755@qq.com>
Date: Mon, 22 Mar 2021 16:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/DownloadController.class.php   | 2 +-
 Application/Home/View/default/TestingResource/batches.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index 8d6e55026..51adae6ff 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/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';
diff --git a/Application/Home/View/default/TestingResource/batches.html b/Application/Home/View/default/TestingResource/batches.html
index 2578afd3a..b7f5a175e 100644
--- a/Application/Home/View/default/TestingResource/batches.html
+++ b/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)