From 06c131d7aa08898d2b855f7d77964f1aaca24ab6 Mon Sep 17 00:00:00 2001
From: wjn <xmwjn@qq.com>
Date: Sat, 11 May 2024 13:43:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../APT.HM.WebApi/Controllers/Api/RiskTaskController.cs   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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<T_HM_RISK_RECORD_DETAIL_FACILITIES> facilities = new List<T_HM_RISK_RECORD_DETAIL_FACILITIES>();
                 List<T_FM_NOTIFICATION_TASK> 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<T_HM_RISK_TASK>(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(() =>
                 {