diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs index 70f3a8f5..664737d2 100644 --- a/SGGL/BLL/Person/Person_PersonsService.cs +++ b/SGGL/BLL/Person/Person_PersonsService.cs @@ -1,4 +1,5 @@ using FineUIPro; +using Microsoft.Office.Interop.Excel; using Model; using System; using System.Collections; @@ -57,8 +58,12 @@ namespace BLL } if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null) { - getDataList = getDataList.Where(e => e.CurrentProjectId == projetcId); + getDataList = from x in getDataList + join y in db.SitePerson_PersonItem on x.PersonId equals y.PersonId + where y.ProjectId == projetcId && !y.OutTime.HasValue + select x; } + if (!string.IsNullOrEmpty(personType) && personType != Const._Null) { getDataList = getDataList.Where(e => e.PersonType == personType);