From 03363887c9918dd2f28a526d855038f802b38663 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:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96get?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/HiddenDangerConfirmController.cs      | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
index 1ec0068..a0f20bd 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
@@ -11,6 +11,7 @@ using APT.MS.Domain.Enums;
 using APT.MS.Domain.Enums.SK;
 using APT.Utility;
 using Microsoft.AspNetCore.Mvc;
+using MySqlX.XDevAPI.Common;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -326,14 +327,30 @@ namespace APT.SK.WebApi.Controllers.Api
                 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);
+                var entity = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(id, new string[] { "Nav_Report", "Nav_ApplyUser","Nav_ApplyDepartment",
+            "Nav_ProductionUnit","Nav_RiskArea","Nav_Contents","Nav_CheckType","Nav_RecitifyUser","Nav_Question"});
+                if (entity != null)
+                {
+                    var newFilter = new BaseFilter(filter.OrgId);
+                    newFilter.SelectField = new List<string> { "ID", "HIDDEN_DANGER_CONFIRM_ID", "IMG_FILE_ID", "Nav_ImgFile.Nav_File", "Nav_ImgFile.FILE_NAME", "Nav_ImgFile.FILE_PATH" };
+                    var photos = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM_PHOTO>(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, newFilter).ToList();
+                    entity.Nav_Photos = photos.ToList();
+                    newFilter.SelectField = new List<string> { "ID", "HIDDEN_DANGER_CONFIRM_ID", "IMG_FILE_ID", "Nav_ImgFile.Nav_File", "Nav_ImgFile.FILE_NAME", "Nav_ImgFile.FILE_PATH" };
+                    var files = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM_FILE>(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, newFilter).ToList();
+                    entity.Nav_Files = files.ToList();
+                    newFilter.SelectField = new List<string> { "ID", "HIDDEN_DANGER_CONFIRM_ID", "LAW_ID", "Nav_Law.NAME" };
+                    var basics = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM_BASIC>(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, newFilter).ToList();
+                    entity.Nav_Basics = basics.ToList();
+                    newFilter.SelectField = new List<string> { "ID", "HIDDEN_DANGER_CONFIRM_ID", "REASON_ID", "Nav_Reason.NAME" };
+                    var reasons = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM_REASON>(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, newFilter).ToList();
+                    entity.Nav_Reasons = reasons.ToList();
+                    if (entity.STATUS == PFStandardStatus.Rejected)
+                    {
+                        entity.CONTEXT = ApproveCallBackService.RejectContent(entity.ID);
+                    }
                 }
-                return result;
+                
+                return entity;
             });
             //var result = WitEntity(null, filter);
             //return result;