From 73c649ac3aed101007b87aadab09f06baecf46a6 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Tue, 6 May 2025 00:30:21 +0800
Subject: [PATCH] update

---
 db/ScriptChanges/Doing_20250503_release.sql                 | 4 ++++
 .../src/main/java/org/jeecg/common/util/DateUtils.java      | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/db/ScriptChanges/Doing_20250503_release.sql b/db/ScriptChanges/Doing_20250503_release.sql
index d9d9d8a..32bfe38 100644
--- a/db/ScriptChanges/Doing_20250503_release.sql
+++ b/db/ScriptChanges/Doing_20250503_release.sql
@@ -17,6 +17,10 @@ CREATE TABLE `component_search` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
+-- 添加权限
+INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `is_route`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_leaf`, `keep_alive`, `hidden`, `hide_tab`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES
+                                                                                                                                                                                                                                                                                                                                                                                  ('1917954826328580097', '1850214135831830529', '报告审核', '/experiment/report', 'experiment/manage/ReportList', 1, '', NULL, 1, NULL, '0', 1.00, 0, 'ant-design:audit-outlined', 1, 0, 0, 0, NULL, 'caoxiang', '2025-05-01 22:50:39', NULL, NULL, 0, 0, NULL, 0),
+                                                                                                                                                                                                                                                                                                                                                                                  ('1916494403063308290', '1834565842028310529', '样品类型', '/database/sampleTypeList', 'database/sampleTypeList/SampleTypeList', 1, '', NULL, 1, NULL, '0', 6.00, 0, NULL, 1, 0, 0, 0, NULL, 'caoxiang', '2025-04-27 22:07:27', NULL, NULL, 0, 0, NULL, 0);
 
 -- 试验报告添加文件路径字段
 ALTER TABLE `physical-boot`.`experiment_report`
diff --git a/physical-base-core/src/main/java/org/jeecg/common/util/DateUtils.java b/physical-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
index 504ac4d..ee2fd26 100644
--- a/physical-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
+++ b/physical-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
@@ -437,6 +437,12 @@ public class DateUtils extends PropertyEditorSupport {
     }
 
     public static String formatDate(String dateStr, String pattern) {
+        if (StringUtils.hasText(dateStr)) {
+            return "";
+        }
+        if (StringUtils.hasText(pattern)) {
+            return dateStr;
+        }
         try {
             Date date = parseDate(dateStr, "yyyy-MM-dd HH:mm");
             return getSdFormat(pattern).format(date);