From 69013539cde9c1cc77692f4c8e29b508efa5e53a Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Wed, 25 Dec 2019 16:37:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9excel=E8=B7=AF=E5=BE=84,?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BF=87excel=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Event/BatchImportExcelEvent.class.php | 2 ++
 Application/Admin/View/Server/batch.html                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Event/BatchImportExcelEvent.class.php b/Application/Admin/Event/BatchImportExcelEvent.class.php
index 7ac435222..c3300e98d 100644
--- a/Application/Admin/Event/BatchImportExcelEvent.class.php
+++ b/Application/Admin/Event/BatchImportExcelEvent.class.php
@@ -64,6 +64,7 @@ class BatchImportExcelEvent extends Controller{
                     if($currentColumn == "C"){
 												$currentvalue = $sheet->getCell($address)->getValue();
 												if (empty($currentvalue)) {
+												    continue;
 													unlink($file);
 													throw new \Exception($address.' 数据为空');
 												}
@@ -86,6 +87,7 @@ class BatchImportExcelEvent extends Controller{
                     }else{
 											$currentvalue = $sheet->getCell($address)->getValue();
 											if (empty($currentvalue)) {
+                                                continue;
 												unlink($file);
 												throw new \Exception($address.' 数据为空');
 											}
diff --git a/Application/Admin/View/Server/batch.html b/Application/Admin/View/Server/batch.html
index 87d06981f..fb237f7c0 100644
--- a/Application/Admin/View/Server/batch.html
+++ b/Application/Admin/View/Server/batch.html
@@ -42,7 +42,7 @@
                 <tbody>
                     <tr>
                         <td class="r"> Execl模板:</td>
-                        <td><a href="/Uploads/excel/区服列表-游戏名称.xls">下载模板</a></td>
+                        <td><a href="/Public/Admin/excel/区服列表-游戏名称.xls">下载模板</a></td>
                     </tr>
                     <tr>
                         <td class="r">导入模板</td>