From 643cd72daa2b70fb83160c3e4248385b9f50df2a Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 9 Mar 2022 19:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/common/util/DateUtils.java  | 20 +++++++-------
 .../BussDocumentLibraryEOServiceImpl.java     | 27 +++++++++++++++++++
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java
index 60c42825d..3b645a7d3 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/DateUtils.java
@@ -654,15 +654,17 @@ public class DateUtils extends PropertyEditorSupport {
      * @Return: boolean
      */
     public static boolean isValidDate(String str){
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String[] strArr = str.split(",");
-        for (String dateStr : strArr) {
-            String replace = dateStr.replace("/", "-");
-            try {
-                simpleDateFormat.setLenient(false);
-                simpleDateFormat.parse(replace);
-            } catch (Exception e){
-                return false;
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(str)){
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            String[] strArr = str.split(",");
+            for (String dateStr : strArr) {
+                String replace = dateStr.replace("/", "-");
+                try {
+                    simpleDateFormat.setLenient(false);
+                    simpleDateFormat.parse(replace);
+                } catch (Exception e){
+                    return false;
+                }
             }
         }
         return true;
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 a522edd05..908130299 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
@@ -2402,6 +2402,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                         if (StringUtils.isNotBlank(stringCellValue)) {
                                             String replace = stringCellValue.replace("，", ",");
                                             rowList.put(headerCell.getStringCellValue(), replace);
+                                        }else{
+                                            rowList.put(headerCell.getStringCellValue(), "");
                                         }
                                     }
                                 }
@@ -2486,6 +2488,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 errorMsg += key + "为必填项,不能为空";
                                 countError++;
                             }
+                            //判断长度
+                            if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
+                                errorMsg += key + "不能超过" + dbLength + "个字符";
+                                countError++;
+                            }
                             //判断数据是否匹配
                             if (StringUtils.isNotBlank(value)) {
                                 for (String valueTemp : value.split(",")) {
@@ -2531,6 +2538,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 errorMsg += key + "为必填项,不能为空";
                                 countError++;
                             }
+                            //判断长度
+                            if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
+                                errorMsg += key + "不能超过" + dbLength + "个字符";
+                                countError++;
+                            }
                             //判断是否是单选
                             if (StringUtils.isNotBlank(value) && value.contains(",")) {
                                 errorMsg += key + "为单选项";
@@ -2556,6 +2568,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 errorMsg += key + "为必填项,不能为空";
                                 countError++;
                             }
+                            //判断长度
+                            if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
+                                errorMsg += key + "不能超过" + dbLength + "个字符";
+                                countError++;
+                            }
                             //下拉多选
                             for (String valueTemp : value.split(",")) {
                                 if (!itemNameList.contains(valueTemp)) {
@@ -2618,6 +2635,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 errorMsg += key + "为必填项,不能为空";
                                 countError++;
                             }
+                            //判断长度
+                            if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
+                                errorMsg += key + "不能超过" + dbLength + "个字符";
+                                countError++;
+                            }
                             if (StringUtils.isNotBlank(value)) {
                                 StringBuilder sb = new StringBuilder();
                                 for (String fileName : value.split(",")) {
@@ -2653,6 +2675,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 errorMsg += key + "为必填项,不能为空";
                                 countError++;
                             }
+                            //判断长度
+                            if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
+                                errorMsg += key + "不能超过" + dbLength + "个字符";
+                                countError++;
+                            }
                             //判断库中是否存在,如果存在则存id,如果不存在则存输入的值
                             List<Map<String, Object>> listBySerialNumber = getListBySerialNumber(value);
                             String serialNumberStr = "";