wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

213retn

Browse Source
This commit is contained in:
wyw 2025-10-23 16:00:42 +08:00
parent e0c0525dd8
commit e587b223ef
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
View File

@ -215,17 +215,16 @@ namespace APT.SK.WebApi.Controllers.Api
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString(); var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
if (string.IsNullOrEmpty(id)) if (string.IsNullOrEmpty(id))
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true;
KeywordFilter filter2 = new KeywordFilter(); filter = new KeywordFilter();
filter2.IgnoreDataRule = true; filter.IgnoreDataRule = true;
filter2.IgnoreOrgRule = true; filter.IgnoreOrgRule = true;
filter2.OrgId = null; filter.OrgId = null;
var result = this.GetEntity<T_SK_RISK_IDENTIFY>(e => e.ID == new Guid(id), filter2, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require", var result = this.GetEntity<T_SK_RISK_IDENTIFY>(e => e.ID == new Guid(id), filter, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_Require",
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"}); "Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, filter2, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit"); var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(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(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {