diff --git a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs index 6c23875f..c89a0a70 100644 --- a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs +++ b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs @@ -45,7 +45,10 @@ namespace BLL public static IEnumerable getListData(string projectId, string checkMan, string type, string workAreaName, string responsibilityUnitName, DateTime? startTime, DateTime? endTime, DateTime? startRectificationTime, DateTime? endRectificationTime , string states, string personId, string unitId, Grid Grid1) { - IQueryable getDataList = getDataLists; + var db= Funs.DB; + IQueryable getDataList = from x in db.View_Hazard_HazardRegisterList + where x.ProblemTypes == "1" + select x; if (!string.IsNullOrEmpty(projectId)) { getDataList = getDataList.Where(e => e.ProjectId == projectId); @@ -101,7 +104,7 @@ namespace BLL return null; } getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); - return from x in getDataList + return (from x in getDataList select new { x.HazardRegisterId, @@ -122,7 +125,7 @@ namespace BLL x.CheckManName, x.RegisterDate, x.StatesStr, - }; + }).ToList(); } #endregion