diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs index 6497c6a..fa9d910 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs @@ -237,10 +237,6 @@ namespace APT.HM.WebApi.Controllers.Api List facilities = new List(); List sendNotices = null; T_FM_NOTIFICATION_TASK finishNotice = null; - if (riskTask.TaskID != null) - { - finishNotice = NotificationTaskService.FOGetTaskFinishModel(riskTask.TaskID, riskTask.ID); - } if (todoCount == 0 && currDetail.Any()) { entity = GetEntity(riskTask.ID, new string[] { "Nav_Identifyings", "Nav_Files", "Nav_Detail.Nav_Area", "Nav_Detail.Nav_User" }); @@ -395,6 +391,10 @@ namespace APT.HM.WebApi.Controllers.Api } sendNotices = NotificationTaskService.InsertUserNoticeTaskModels(noticeTitles, noticeDataIds, orgId, noticeUserIds, noticeUserNames, DateTime.Now, DateTime.Parse(DateTime.Now.AddDays(7).ToShortDateString() + " 23:59:59"), 0, "HM064"); } + if (riskTask.TaskID != null) + { + finishNotice = NotificationTaskService.FOGetTaskFinishModel(riskTask.TaskID, riskTask.ID); + } } UnifiedCommit(() => {