From b067f9658e63576492f875e530b4d9c398007951 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Tue, 1 Nov 2022 10:22:05 +0800 Subject: [PATCH] =?UTF-8?q?20221101=E9=83=A8=E9=97=A8=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=8C=89=E9=A1=B9=E7=9B=AE=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/Person/Person_PersonsService.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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);