From e587b223ef2d75a23e089ded062bafba55fe1823 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Thu, 23 Oct 2025 16:00:42 +0800 Subject: [PATCH] 213retn --- .../Controllers/Api/RiskIdentifyController.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs index 105ede9..f6aa377 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs @@ -215,17 +215,16 @@ 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"); - filter.IgnoreDataRule = true; - KeywordFilter filter2 = new KeywordFilter(); - filter2.IgnoreDataRule = true; - filter2.IgnoreOrgRule = true; - filter2.OrgId = null; - var result = this.GetEntity(e => e.ID == new Guid(id), filter2, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require", + filter = new KeywordFilter(); + filter.IgnoreDataRule = true; + filter.IgnoreOrgRule = true; + filter.OrgId = null; + var result = this.GetEntity(e => e.ID == new Guid(id), filter, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require", "Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"}); if (result != null) { - var details = this.GetEntities(t => t.RISK_IDENTIFY_ID == result.ID, filter2, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit"); + var details = this.GetEntities(t => t.RISK_IDENTIFY_ID == result.ID, filter, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit"); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); if (result.STATUS == PFStandardStatus.Rejected) {