From 5bbf5af198a5ed6838b26eea18c91346f517b820 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Sat, 2 Apr 2022 13:58:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A-?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/handler/IcNatExcelImportListener.java  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java
index db24888b03..466743bdd8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java
@@ -66,10 +66,18 @@ public class IcNatExcelImportListener implements ReadListener<IcNatImportExcelDa
             // 先校验数据
             ValidatorUtils.validateEntity(data);
 
-            data.setName(data.getName().trim());
-            data.setMobile(data.getMobile().trim());
-            data.setNatAddress(data.getNatAddress().trim());
-            data.setIdCard(data.getIdCard().trim());
+            if (StringUtils.isNotBlank(data.getName())) {
+                data.setName(data.getName().trim());
+            }
+            if (StringUtils.isNotBlank(data.getMobile())) {
+                data.setMobile(data.getMobile().trim());
+            }
+            if (StringUtils.isNotBlank(data.getNatAddress())) {
+                data.setNatAddress(data.getNatAddress().trim());
+            }
+            if (StringUtils.isNotBlank(data.getIdCard())) {
+                data.setIdCard(data.getIdCard().trim());
+            }
 
             // 默认空，没有结果
             String natResult = "";