From 8bf2cda7c345baa295de7dfa68642d564ea72dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 21 May 2024 12:29:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EmployeeDeclareExcelServiceImpl.java | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java
index 98589a15f..067b4acfd 100644
--- a/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java
@@ -397,28 +397,32 @@ public class EmployeeDeclareExcelServiceImpl extends Service implements Employee
                             }
                         }
                     } else if (StringUtils.equals(dataKey, SalaryI18nUtil.getI18nLabel(0, "首次入境时间"))) {
-                        if (StringUtils.isNotBlank(dataValue) && dataValue.length() >= 10) {
-                            dataValue = dataValue.substring(0, 10);
-                        }
-                        if (!SalaryDateUtil.checkDay(dataValue)) {
-                            isError = true;
-                            Map<String, String> errorMessageMap = Maps.newHashMap();
-                            errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(0, "日期格式不正确"));
-                            errorData.add(errorMessageMap);
-                        } else {
-                            employeeDeclareExcel.setEntryDate(SalaryDateUtil.dateStrToLocalDate(dataValue));
+                        if (StringUtils.isNotBlank(dataValue)) {
+                            if (dataValue.length() >= 10) {
+                                dataValue = dataValue.substring(0, 10);
+                            }
+                            if (!SalaryDateUtil.checkDay(dataValue)) {
+                                isError = true;
+                                Map<String, String> errorMessageMap = Maps.newHashMap();
+                                errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(0, "日期格式不正确"));
+                                errorData.add(errorMessageMap);
+                            } else {
+                                employeeDeclareExcel.setEntryDate(SalaryDateUtil.dateStrToLocalDate(dataValue));
+                            }
                         }
                     } else if (StringUtils.equals(dataKey, SalaryI18nUtil.getI18nLabel(0, "预计离境时间"))) {
-                        if (StringUtils.isNotBlank(dataValue) && dataValue.length() >= 10) {
-                            dataValue = dataValue.substring(0, 10);
-                        }
-                        if (!SalaryDateUtil.checkDay(dataValue)) {
-                            isError = true;
-                            Map<String, String> errorMessageMap = Maps.newHashMap();
-                            errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(0, "日期格式不正确"));
-                            errorData.add(errorMessageMap);
-                        } else {
-                            employeeDeclareExcel.setDepartureDate(SalaryDateUtil.dateStrToLocalDate(dataValue));
+                        if (StringUtils.isNotBlank(dataValue)) {
+                            if (StringUtils.isNotBlank(dataValue) && dataValue.length() >= 10) {
+                                dataValue = dataValue.substring(0, 10);
+                            }
+                            if (!SalaryDateUtil.checkDay(dataValue)) {
+                                isError = true;
+                                Map<String, String> errorMessageMap = Maps.newHashMap();
+                                errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(0, "日期格式不正确"));
+                                errorData.add(errorMessageMap);
+                            } else {
+                                employeeDeclareExcel.setDepartureDate(SalaryDateUtil.dateStrToLocalDate(dataValue));
+                            }
                         }
                     } else if (StringUtils.equals(dataKey, SalaryI18nUtil.getI18nLabel(0, "涉税事由"))) {
                         employeeDeclareExcel.setTaxReasons(dataValue);