diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs index 57a7907..60ebcd7 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs @@ -57,7 +57,11 @@ namespace APT.SK.WebApi.Controllers.Api List deleteDetailIds = new List(); List fileList = new List(); List basicList = new List(); - List reasonList = new List(); + List reasonList = new List(); + if (details != null) + { + details = details.Where(t => !t.IS_DELETED).ToList(); + } if (details != null && details.Any()) { var evaluationIsExist = this.GetEntity(t => t.ID == entity.ID, new string[] { "Nav_RectifyDetails", "Nav_RectifyDetails.Nav_RectifyDetailFiles", "Nav_RectifyDetails.Nav_RectifyDetailBasics", "Nav_RectifyDetails.Nav_RectifyDetailReasons" }); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs index 2ec0e15..f3eb8af 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs @@ -72,7 +72,11 @@ namespace APT.SK.WebApi.Controllers.Api List fileList = new List(); List basicList = new List(); List reasonList = new List(); - SKHiddenLevel? hiddenLevel = SKHiddenLevel.General; + SKHiddenLevel? hiddenLevel = SKHiddenLevel.General; + if (details != null) + { + details = details.Where(t => !t.IS_DELETED).ToList(); + } if (details != null && details.Any()) { var evaluationIsExist = this.GetEntity(t => t.ID == entity.ID, new string[] { "Nav_ReportDetails", "Nav_ReportDetails.Nav_ReportDetailFiles", "Nav_ReportDetails.Nav_ReportDetailBasics" , "Nav_ReportDetails.Nav_ReportDetailReasons" }); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs index e4bd0c8..81158f1 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs @@ -176,8 +176,11 @@ namespace APT.SK.WebApi.Controllers.Api List deleteUserIds = new List(); List deleteBasicIds = new List(); List deleteDetailIds = new List(); - List userList = new List(); - List basicList = new List(); + List userList = new List(); + if (details != null) + { + details = details.Where(t => !t.IS_DELETED).ToList(); + } if (details != null && details.Any()) { var evaluationIsExist = this.GetEntity(t => t.ID == entity.ID, new string[] { "Nav_CheckNoticeDetails", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailUsers", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailBasics" }); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs index dc6fb6d..734ee9f 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs @@ -474,7 +474,11 @@ namespace APT.SK.WebApi.Controllers.Api List userList = new List(); List basicList = new List(); List fileList = new List(); - List reasonList = new List(); + List reasonList = new List(); + if (details != null) + { + details = details.Where(t => !t.IS_DELETED).ToList(); + } if (details != null && details.Any()) { var evaluationIsExist = this.GetEntity(t => t.ID == entity.ID, new string[] { "Nav_CheckRecordDetails", "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles", "Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics", "Nav_CheckRecordDetails.Nav_CheckRecordDetailReasons" }); @@ -506,10 +510,7 @@ namespace APT.SK.WebApi.Controllers.Api deleteDetailIds.Add(t.ID); }); } - if (details != null) - { - details = details.Where(t => !t.IS_DELETED).ToList(); - } + foreach (var item in details) { if (item.CHECK_RESULT == null) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs index d4c3859..c13de47 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs @@ -68,7 +68,11 @@ namespace APT.SK.WebApi.Controllers.Api List userList = new List(); List basicList = new List(); List reasonList = new List(); - List fileList = new List(); + List fileList = new List(); + if (details != null) + { + details = details.Where(t => !t.IS_DELETED).ToList(); + } if (details != null && details.Any()) { var groupDetails = details.Where(m => m.CHECK_RESULT == SKCheckResultEnum.Yes && m.IS_DELETED == false).GroupBy(t => new { t.RISK_AREA_ID, t.CHECK_CONTENTS_ID, t.CHECK_QUESTION_ID }).ToList(); @@ -108,10 +112,7 @@ namespace APT.SK.WebApi.Controllers.Api deleteDetailIds.Add(t.ID); }); } - if (details != null) - { - details = details.Where(t => !t.IS_DELETED).ToList(); - } + foreach (var item in details) { if (item.CHECK_RESULT == null)