From a92ee36a15cb1f478ef7da4f25fab0b12c1b30f4 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang>
Date: Tue, 14 Jun 2022 22:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=EF=BC=8C=E6=9F=A5=E8=AF=A2remote=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=85=88=E5=88=A4=E6=96=AD=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E5=A1=AB=E5=B0=B1=E4=B8=8D=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiUserImportServiceImpl.java      | 10 ++++++++--
 1 file changed, 8 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 8562af6077..c74466fcd1 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
@@ -72,6 +72,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Path;
+import java.time.DateTimeException;
 import java.time.LocalDate;
 import java.time.Period;
 import java.util.*;
@@ -647,7 +648,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         }
 
         // 出生日期 & 年龄
-        LocalDate birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
+        LocalDate birthday = null;
+        try {
+            birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day));
+        } catch (DateTimeException e) {
+            throw new EpmetException("身份证号中日期信息错误");
+        }
         int age = Period.between(birthday, LocalDate.now()).getYears();
 
         // 性别 & 生日 & 老年人
@@ -910,7 +916,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     Map<String, String> itemOptions = columnWrapper.getOptions();
                     String colValue = itemOptions.get(cellContent);
                     columnWrapper.setColValue(colValue);
-                } else {
+                } else if (StringUtils.isNotBlank(cellContent)) {
                     String fullUri = columnWrapper.getOptionSourceValue();
                     String[] uriParts = splitOptionSourceUrl(fullUri);
                     String pureUri = uriParts[0];