diff --git a/SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs b/SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs index 80c2b087..b1d2b420 100644 --- a/SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs +++ b/SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs @@ -45,7 +45,9 @@ namespace BLL /// public static IEnumerable getListData(string projectId, string startTime, string endTime, Grid Grid1) { - IQueryable getDataList = getDataLists; + Model.SGGLDB db = Funs.DB; + IQueryable getDataList = from x in db.Check_ProjectLeaderCheck + select x; if (!string.IsNullOrEmpty(projectId)) { getDataList = getDataList.Where(x => x.ProjectId == projectId); @@ -72,16 +74,15 @@ namespace BLL return null; } getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); - var db1 = Funs.DB; return from x in getDataList - join y in db1.Base_Project on x.ProjectId equals y.ProjectId + join y in db.Base_Project on x.ProjectId equals y.ProjectId into ps from y in ps.DefaultIfEmpty() select new { x.ProjectLeaderCheckId, x.ProjectId, - db1.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName, + db.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName, x.CheckCode, x.UnitIds, x.LeaderIds,