From f848d07585014ab469bd4cc2b5792d14ddf2f75f Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Wed, 14 Nov 2018 16:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=9D=9E=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E6=8D=95=E6=8D=89=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA=E4=B8=BA?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/controller/BaseController.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 307292229..412e8037e 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -1683,7 +1683,11 @@ public class BaseController {
 					ei.getUploadFile().delete();
 				}
 			}
-			addMessage(redirectAttributes,"error", e.getMessage());
+			if(e instanceof MaatConvertException||e instanceof ServiceException) {
+				addMessage(redirectAttributes,"error", e.getMessage());
+			}else {
+				addMessage(redirectAttributes,"error",  "import_failed");
+			}
 			e.printStackTrace();
 		}
 		long end=System.currentTimeMillis();