From 8c14a17b356a9b4c0e32c74d38f378614290eb03 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 1 Sep 2022 10:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarLawsDetailedListServiceImpl.java  | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
index 4cb1b4f5..f4234b35 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
@@ -895,22 +895,28 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
         if (null != res && "".equals(stringBuilder.toString())) {
             for (ExportEmptyModelDto re : res) {
                 if (!(re.getSsrq().contains(",") || re.getSsrq().contains("，"))) {
-                    Date date = org.apache.poi.ss.usermodel.DateUtil
-                            .getJavaDate(Double.valueOf(re.getSsrq()));
-                    DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-                    re.setSsrq(format.format(date));
+                    if(StringUtils.isNotEmpty(re.getSsrq())){
+                        Date date = org.apache.poi.ss.usermodel.DateUtil
+                                .getJavaDate(Double.parseDouble(re.getSsrq()));
+                        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                        re.setSsrq(format.format(date));
+                    }
                 }
                 if (!(re.getXcxssrqgj().contains(",") || re.getXcxssrqgj().contains("，"))) {
-                    Date date = org.apache.poi.ss.usermodel.DateUtil
-                            .getJavaDate(Double.valueOf(re.getXcxssrqgj()));
-                    DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-                    re.setXcxssrqgj(format.format(date));
+                    if(StringUtils.isNotEmpty(re.getXcxssrqgj())) {
+                        Date date = org.apache.poi.ss.usermodel.DateUtil
+                                .getJavaDate(Double.parseDouble(re.getXcxssrqgj()));
+                        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                        re.setXcxssrqgj(format.format(date));
+                    }
                 }
                 if (!(re.getZccssrqgj().contains(",") || re.getZccssrqgj().contains("，"))) {
-                    Date date = org.apache.poi.ss.usermodel.DateUtil
-                            .getJavaDate(Double.valueOf(re.getZccssrqgj()));
-                    DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-                    re.setZccssrqgj(format.format(date));
+                    if(StringUtils.isNotEmpty(re.getZccssrqgj())) {
+                        Date date = org.apache.poi.ss.usermodel.DateUtil
+                                .getJavaDate(Double.parseDouble(re.getZccssrqgj()));
+                        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                        re.setZccssrqgj(format.format(date));
+                    }
                 }
             }