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; } /// + /// 用户ID + /// + public string UserId + { + get; + set; + } + /// /// 用户姓名 /// public string PersonName