From 79e64992c5c8a8abee0d30f1e925c40c05661263 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: Mon, 18 May 2026 10:20:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E7=A1=AE=E8=AE=A4=E5=8D=95?=
 =?UTF-8?q?=E7=82=B9=E5=BC=80=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/HiddenDangerConfirmController.cs      | 46 +++++++++++--------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
index 03d82cb..1ec0068 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
@@ -1,19 +1,20 @@
-using APT.BaseData.Domain.IServices.FM;
-using APT.BaseData.Domain.IServices;
-using APT.Infrastructure.Core;
-using APT.MS.Domain.Entities.SK;
-using APT.Utility;
-using Microsoft.AspNetCore.Mvc;
+using APT.BaseData.Domain.Entities;
 using APT.BaseData.Domain.Entities.FM;
-using APT.BaseData.Domain.Entities;
-using APT.BaseData.Domain.Enums.PF;
 using APT.BaseData.Domain.Enums;
+using APT.BaseData.Domain.Enums.PF;
+using APT.BaseData.Domain.IServices;
+using APT.BaseData.Domain.IServices.FM;
+using APT.Infrastructure.Core;
+using APT.MS.Domain.Entities.FO;
+using APT.MS.Domain.Entities.SK;
 using APT.MS.Domain.Enums;
 using APT.MS.Domain.Enums.SK;
-using System.Threading.Tasks;
-using System.Linq;
+using APT.Utility;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace APT.SK.WebApi.Controllers.Api
 {
@@ -319,14 +320,23 @@ namespace APT.SK.WebApi.Controllers.Api
         /// <returns></returns>
         [HttpPost, Route("SKGet")]
         public JsonActionResult<T_SK_HIDDEN_DANGER_CONFIRM> SKGet([FromBody] KeywordFilter filter)
-        {
-            filter.IgnoreDataRule = true;
-            var result = WitEntity(null, filter);
-            if (result != null && result.Data != null && result.Data.STATUS == PFStandardStatus.Rejected)
-            {
-                result.Data.CONTEXT = ApproveCallBackService.RejectContent(result.Data.ID);
-            }
-            return result;
+        {
+            return SafeExecute(() => {
+                filter.IgnoreDataRule = true;
+                var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
+                if (string.IsNullOrEmpty(id))
+                    this.ThrowError("060010");
+                var result = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(id, new string[] { "Nav_Report", "Nav_ApplyUser","Nav_ApplyDepartment",
+            "Nav_ProductionUnit","Nav_RiskArea","Nav_Photos.Nav_ImgFile","Nav_Contents","Nav_CheckType","Nav_RecitifyUser","Nav_Question",
+                "Nav_Files.Nav_ImgFile","Nav_Basics.Nav_Law","Nav_Reasons.Nav_Reason"});
+                if (result != null && result.STATUS == PFStandardStatus.Rejected)
+                {
+                    result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);
+                }
+                return result;
+            });
+            //var result = WitEntity(null, filter);
+            //return result;
         }
 
         /// <summary>