From d656dc43bd1fe03b43142f229484d0c085d1f68e Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Thu, 7 Jul 2022 12:51:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E3=80=91=E4=BF=AE=E6=94=B9=E6=8D=95=E8=8E=B7?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=B9=8B=E5=90=8E=EF=BC=8C=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcResiUserImportServiceImpl.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 26b8d7214e..cc1155c7c8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -572,8 +572,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
             } catch (Exception e) {
                 String errorMsg;
-                if (e instanceof RenException | e instanceof EpmetException) {
-                    errorMsg = e.getMessage();
+
+                if (e instanceof RenException) {
+                    errorMsg = ((RenException)e).getMsg();
+                } else if (e instanceof EpmetException) {
+                    errorMsg = ((EpmetException)e).getMsg();
                 } else {
                     errorMsg = "未知系统错误";
                     log.error(ExceptionUtils.getErrorStackTrace(e));