From bca79e3c1d904ea5b856922ecad1d008c1f33016 Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Tue, 13 Dec 2016 10:06:25 +0800
Subject: [PATCH] =?UTF-8?q?excel=E5=AF=BC=E5=85=A5=E5=87=BA=E9=94=99?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=BF=94=E5=9B=9E=E8=AF=A6=E7=BB=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/platform/controller/ExcelController.java | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/com/platform/controller/ExcelController.java b/src/com/platform/controller/ExcelController.java
index 473af3aa..1717f3d5 100644
--- a/src/com/platform/controller/ExcelController.java
+++ b/src/com/platform/controller/ExcelController.java
@@ -289,19 +289,17 @@ public class ExcelController extends BaseController{
 		if (listPath.size() > 0) {
 			//导入
 			result = preDataInfoService.importExcel(listPath);
+			//导入成功后再次请求数据
+			List<PreDataInfo> datalist = preDataInfoService.findAll();
+			modelMap.addAttribute("data", datalist);
+			modelMap.addAttribute("length", datalist.size());
+			modelMap.addAttribute("code","1001");
 			//失败
-			if (result.containsKey("fileUnExist")/* || result.containsKey("areaUnImport")*/) {
-				modelMap.addAttribute("data", result);
+			if (result.keySet().size() > 0) {
+				modelMap.addAllAttributes(result);
 				modelMap.addAttribute("code","3001");
 				response.setStatus(500);
 			}
-			//成功
-			else {
-				List<PreDataInfo> datalist = preDataInfoService.findAll();
-				modelMap.addAttribute("data", datalist);
-				modelMap.addAttribute("length", datalist.size());
-				modelMap.addAttribute("code","1001");
-			}
 			//删除文件
 			List<String> failedDelete = new ArrayList<String>();
 			for (String filePath : listPath) {