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 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 datalist = preDataInfoService.findAll(); - modelMap.addAttribute("data", datalist); - modelMap.addAttribute("length", datalist.size()); - modelMap.addAttribute("code","1001"); - } //删除文件 List failedDelete = new ArrayList(); for (String filePath : listPath) {