From 552ba5a7ffba0bd69ce6c41fb4118653e3c7b85e Mon Sep 17 00:00:00 2001
From: bluesky <61043157@qq.com>
Date: Wed, 3 May 2023 11:34:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=98=AFNull=E5=80=BC=E6=97=B6=E4=BB=A5=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8D=A2=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SimpleAdmin.Web.Core/Logging/DatabaseLoggingWriter.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/SimpleAdmin/SimpleAdmin.Web.Core/Logging/DatabaseLoggingWriter.cs b/api/SimpleAdmin/SimpleAdmin.Web.Core/Logging/DatabaseLoggingWriter.cs
index 35f4d5f..5d3afc4 100644
--- a/api/SimpleAdmin/SimpleAdmin.Web.Core/Logging/DatabaseLoggingWriter.cs
+++ b/api/SimpleAdmin/SimpleAdmin.Web.Core/Logging/DatabaseLoggingWriter.cs
@@ -130,7 +130,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter
         {
             if (loggingMonitor.ReturnInformation.Value != null)//如果返回值不为空
             {
-                var time = DateTime.Parse(loggingMonitor.ReturnInformation.Value.Time);//转成时间
+                var time = loggingMonitor.ReturnInformation.Value.Time != null ? DateTime.Parse(loggingMonitor.ReturnInformation.Value.Time) : DateTime.Now;//转成时间
                 loggingMonitor.ReturnInformation.Value.Time = time.ToString(CultureInfo.CurrentCulture);//转成字符串
                 resultJson = loggingMonitor.ReturnInformation.Value.ToJsonString();
             }
-- 
Gitee


From 58b0124e063115428a2ad0b11bbf59487a2e44e6 Mon Sep 17 00:00:00 2001
From: bluesky <61043157@qq.com>
Date: Wed, 3 May 2023 21:11:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=EF=BC=9A=E5=AD=90=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SimpleAdmin.Plugin.SqlSugar/Entity/System/SysOrg.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/SimpleAdmin/SimpleAdmin.Plugin/SimpleAdmin.Plugin.SqlSugar/Entity/System/SysOrg.cs b/api/SimpleAdmin/SimpleAdmin.Plugin/SimpleAdmin.Plugin.SqlSugar/Entity/System/SysOrg.cs
index 22b7668..5ce5d1b 100644
--- a/api/SimpleAdmin/SimpleAdmin.Plugin/SimpleAdmin.Plugin.SqlSugar/Entity/System/SysOrg.cs
+++ b/api/SimpleAdmin/SimpleAdmin.Plugin/SimpleAdmin.Plugin.SqlSugar/Entity/System/SysOrg.cs
@@ -50,7 +50,7 @@ public class SysOrg : BaseEntity
     public int? SortCode { get; set; }
 
     /// <summary>
-    /// 字节点
+    /// 子节点
     /// </summary>
     [SugarColumn(IsIgnore = true)]
     public List<SysOrg> Children { get; set; }
-- 
Gitee