diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs index 19102dd..47502ef 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs @@ -745,7 +745,8 @@ namespace APT.SK.WebApi.Controllers // "ACCEPT_OPINION","STATUS","Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType","Nav_RiskArea.NAME","Nav_Contents","Nav_Question.DESCREPTION","Nav_RecitifyUser","Nav_ImplementUser.NAME","Nav_AcceptUser.NAME","Nav_RectifyPhotoas.Nav_ImgFile", // "Nav_RectifyPhotoas.IMG_FILE_ID","Nav_RectifyPhotobs.IMG_FILE_ID","Nav_RectifyPhotobs.Nav_ImgFile","Nav_RectifyFiles.Nav_ImgFile","Nav_RectifyFiles.IMG_FILE_ID", "Nav_RectifyBasics.LAW_ID","Nav_RectifyBasics.Nav_Law" }; pageFilter.SelectField.Add("HIDDEN_DANGER_CONFIRM_ID"); - var result = this.GetOrderPageEntities(null, pageFilter); + var departIds = this.GetEntities_noneBase(t => t.IS_DELETED == true || t.ENABLE_STATUS == 1).Select(m => m.ID).ToList(); + var result = this.GetOrderPageEntities(t=> t.APPLY_DEPARTMENT_ID!=null &&!departIds.Contains((Guid)t.APPLY_DEPARTMENT_ID), pageFilter); if (result != null && result.Data != null && result.Data.Any()) { result.Data.ForEach(t =>