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 /// [HttpPost, Route("SKGet")] public JsonActionResult 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(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; } ///