From 66b658f2c6ae38e194e6c6f5c4d73f893298f150 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 17 Jun 2022 18:27:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 24ddb5449..a674d8386 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -608,10 +608,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             if ("issue_time".equals(onlCgformField.getDbFieldName())) {
                 map.put("sort", "true");//列表排序标识
             }
-//            if ("issue_time".equals(onlCgformField.getDbFieldName())
-//                    || "implement_time".equals(onlCgformField.getDbFieldName())) {
-//                map.put("sort", "true");//列表排序标识
-//            }
             map.put("db_field_name", onlCgformField.getDbFieldName());//字段
             if (CutEnum.CN.getValue().equals(cut)) {
                 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
@@ -1592,16 +1588,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             String issueTime = (String) (map.get("issue_time"));
-            Date issueTimeDate = df.parse(issueTime);
+            Date issueTimeDate = null;
+            if(StringUtils.isNotBlank(issueTime)){
+                issueTimeDate = df.parse(issueTime);
+            }
             String implementTime = (String) map.get("implement_time");//在产车实施日期
             String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期
-            if (StringUtils.isNotBlank(implementTime)) {
+            if (StringUtils.isNotBlank(implementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                 Date implementTimeDate = df.parse(implementTime);
                 if (issueTimeDate.after(implementTimeDate)) {
                     throw new JeroBootException("发布日期不能大于在产车实施日期");
                 }
             }
-            if (StringUtils.isNotBlank(newCarimplementTime)) {
+            if (StringUtils.isNotBlank(newCarimplementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                 Date newCarimplementTimeDate = df.parse(newCarimplementTime);
                 if (issueTimeDate.after(newCarimplementTimeDate)) {
                     throw new JeroBootException("发布日期不能大于新车型实施日期");
@@ -2201,16 +2200,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         try {
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             String issueTime = (String) map.get("issue_time");
-            Date issueTimeDate = df.parse(issueTime);
+            Date issueTimeDate = null;
+            if(StringUtils.isNotBlank(issueTime)){
+                issueTimeDate = df.parse(issueTime);
+            }
             String implementTime = (String) map.get("implement_time");//在产车实施日期
             String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期
-            if (StringUtils.isNotBlank(implementTime)) {
+            if (StringUtils.isNotBlank(implementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                 Date implementTimeDate = df.parse(implementTime);
                 if (issueTimeDate.after(implementTimeDate)) {
                     throw new JeroBootException("发布日期不能大于在产车实施日期");
                 }
             }
-            if (StringUtils.isNotBlank(newCarimplementTime)) {
+            if (StringUtils.isNotBlank(newCarimplementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                 Date newCarimplementTimeDate = df.parse(newCarimplementTime);
                 if (issueTimeDate.after(newCarimplementTimeDate)) {
                     throw new JeroBootException("发布日期不能大于新车型实施日期");