Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

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.' 数据为空');
 											}

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>