From 81eb1855efe4b473671f9aba880b22d93422d129 Mon Sep 17 00:00:00 2001 From: wjn Date: Wed, 10 Apr 2024 14:41:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PreShiftMeetingRecordController.cs | 7 ++++++- .../APT.HM.WebApi/Controllers/Api/RiskRecordController.cs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs index 2f793e4..ff06ce4 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs @@ -147,7 +147,12 @@ namespace APT.FO.WebApi.Controllers.Api.FO { entity.PRE_MEETING_STATUS = FOPreMeetingStatusEnum.归档; } - sendNotices = NotificationTaskService.InsertUserNoticeTaskModels(title, entity.ID, entity.ORG_ID, userIds, userNames, DateTime.Now, entity.START_TIME.AddHours(1), (int)FMNoticeTypeEnum.消息, "FO003_SHOWPRINT"); + var endTime = DateTime.Now.AddHours(1); + if (entity.START_TIME != DateTime.MinValue) + { + endTime = entity.START_TIME.AddHours(1); + } + sendNotices = NotificationTaskService.InsertUserNoticeTaskModels(title, entity.ID, entity.ORG_ID, userIds, userNames, DateTime.Now, endTime, (int)FMNoticeTypeEnum.消息, "FO003_SHOWPRINT"); var taskId = entity.TaskID; if (taskId == Guid.Empty) { diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskRecordController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskRecordController.cs index 9f5f6e6..c195778 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskRecordController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskRecordController.cs @@ -44,7 +44,7 @@ namespace APT.HM.WebApi.Controllers.Api { return SafeExecute(() => { - var users = entity.Nav_Users; + var users = GetEntities(t=>t.RECORD_ID==entity.ID,new BaseFilter(entity.ORG_ID)); var identifyings = entity.Nav_Identifyings; var files = entity.Nav_Files; var details = entity.Nav_Details;