From f6d27202278c25b2048229437afac811b5dee057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Tue, 18 Nov 2025 09:56:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/SecurityInspectionNoticeController.cs | 66 +++++++++++++------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
index cb3585c..59682b3 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
@@ -1735,15 +1735,28 @@ namespace APT.SK.WebApi.Controllers.Api
                         {
                             //发起
                             var temp1 = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID == safeNoticeId && !t.NOTICE_TITLE.Contains("确认"));
-                            OperateLogList start = new OperateLogList();
-                            start.USER_NAME = temp1.USER_NAME;
-                            start.NAME = "安全检查通知";
-                            start.DEAL_DATE = temp1.TASK_DT;
-                            start.CREATE_TIME = temp1.CREATE_TIME;
-                            start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
-                            noticeLog.logList.Add(start);
-                            //审批
-                            var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == safeNoticeId);
+                            if (temp1 != null)
+                            {
+                                OperateLogList start = new OperateLogList();
+                                start.USER_NAME = temp1.USER_NAME;
+                                start.NAME = "安全检查通知";
+                                start.DEAL_DATE = temp1.TASK_DT;
+                                start.CREATE_TIME = temp1.CREATE_TIME;
+                                start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
+                                noticeLog.logList.Add(start);
+                            }
+                            else
+                            {
+                                OperateLogList start = new OperateLogList();
+                                start.USER_NAME = checkUser.NAME;
+                                start.NAME = "安全检查通知";
+                                start.DEAL_DATE = check.MODIFY_TIME;
+                                start.CREATE_TIME = check.CREATE_TIME;
+                                start.STATUS = check.STATUS ==  PFStandardStatus.Archived ? 10 : 0;
+                                noticeLog.logList.Add(start);
+                            }
+                                //审批
+                                var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == safeNoticeId);
                             if (approveTemp == null)
                             {
                                 //判断发起人层级，取审批模板
@@ -1798,7 +1811,6 @@ namespace APT.SK.WebApi.Controllers.Api
                             var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == safeNoticeId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m=>m.CREATE_TIME).ThenBy(n=>n.MODIFY_TIME).ToList();
                             if (temp2 != null && temp2.Any())
                             {
-                                noticeLog.logList = new List<OperateLogList>();
                                 foreach (var item in temp2)
                                 {
                                     OperateLogList start1 = new OperateLogList();
@@ -1936,15 +1948,29 @@ namespace APT.SK.WebApi.Controllers.Api
                         {
                             //发起
                             var temp1 = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID == dangerReportId && !t.NOTICE_TITLE.Contains("确认"));
-                            OperateLogList start = new OperateLogList();
-                            start.USER_NAME = temp1.USER_NAME;
-                            start.NAME = "隐患上报";
-                            start.DEAL_DATE = temp1.TASK_DT;
-                            start.CREATE_TIME = temp1.CREATE_TIME;
-                            start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
-                            hiddenReportLog.logList.Add(start);
-                            //审批
-                            var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == dangerReportId);
+                            if (temp1 != null)
+                            {
+                                OperateLogList start = new OperateLogList();
+                                start.USER_NAME = temp1.USER_NAME;
+                                start.NAME = "隐患上报";
+                                start.DEAL_DATE = temp1.TASK_DT;
+                                start.CREATE_TIME = temp1.CREATE_TIME;
+                                start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
+                                hiddenReportLog.logList.Add(start);
+                            }
+                            else
+                            {
+                                var reportUser = users.FirstOrDefault(t => t.ID == dangerReport.APPLY_USER_ID);
+                                OperateLogList start = new OperateLogList();
+                                start.USER_NAME = reportUser.NAME;
+                                start.NAME = "隐患上报";
+                                start.DEAL_DATE = dangerReport.MODIFY_TIME;
+                                start.CREATE_TIME = dangerReport.CREATE_TIME;
+                                start.STATUS = dangerReport.STATUS ==  PFStandardStatus.Archived ? 10 : 0;
+                                hiddenReportLog.logList.Add(start);
+                            }
+                                //审批
+                                var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == dangerReportId);
                             if (approveTemp == null)
                             {
                                 //判断发起人层级，取审批模板
@@ -2032,7 +2058,7 @@ namespace APT.SK.WebApi.Controllers.Api
                             start.STATUS = 0;
                             hiddenReportLog.logList.Add(start);
                             //判断发起人层级，取审批模板
-                            var departFirst = departs.FirstOrDefault(t => t.ID == dangerReport.APPLY_DEPARTMENT_ID);
+                            var departFirst = departs.FirstOrDefault(t => t.ID == check.APPLY_DEPARTMENT_ID);
                             var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departFirst.DEPARTMENT_TYPE);
                             if (departFirst.DEPARTMENT_STATUS != 1)
                             {