From d9574eba57224f868485b2533d155854735625af Mon Sep 17 00:00:00 2001
From: yhw0507 <yhw0508@163.com>
Date: Fri, 9 Sep 2022 10:15:35 +0800
Subject: [PATCH] =?UTF-8?q?20220909=E5=B7=A5=E7=A8=8B=E5=B8=88=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/API/HSSE/APIHSEDiaryService.cs | 2 +-
 SGGL/Model/APIItem/HSSE/HSEDiaryItem.cs | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/SGGL/BLL/API/HSSE/APIHSEDiaryService.cs b/SGGL/BLL/API/HSSE/APIHSEDiaryService.cs
index 18d59e9d..26c2d4a7 100644
--- a/SGGL/BLL/API/HSSE/APIHSEDiaryService.cs
+++ b/SGGL/BLL/API/HSSE/APIHSEDiaryService.cs
@@ -119,7 +119,7 @@ namespace BLL
                     HSEDiaryId = item.HSEDiaryId,
                     ProjectId = item.ProjectId,
                     DiaryDate = Funs.GetNewDateTime(item.DiaryDate),
-                    UserId = item.PersonId,
+                    UserId = item.PersonId ?? item.UserId,
                     DailySummary = item.DailySummary,
                     TomorrowPlan = item.TomorrowPlan,
                     Value1 = item.Value1,
diff --git a/SGGL/Model/APIItem/HSSE/HSEDiaryItem.cs b/SGGL/Model/APIItem/HSSE/HSEDiaryItem.cs
index ff50d38d..d939a402 100644
--- a/SGGL/Model/APIItem/HSSE/HSEDiaryItem.cs
+++ b/SGGL/Model/APIItem/HSSE/HSEDiaryItem.cs
@@ -38,6 +38,14 @@
             set;
         }
         /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string UserId
+        {
+            get;
+            set;
+        }
+        /// <summary>
         /// 用户姓名
         /// </summary>
         public string PersonName