From 1f6b160ead32c98bcd05786235dc6ec083bc51ad Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Wed, 11 Jun 2025 14:12:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E9=80=89=E4=BF=AE=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=96=B0=E4=BA=BA=E8=AE=AD=E4=BA=A7=E7=94=9F=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=96=B0=E5=A2=9E=E5=89=94=E9=99=A4=E5=AE=9D?= =?UTF-8?q?=E8=BF=9E=E9=80=9A=E4=B8=B4=E6=97=B6=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs index c67c8f43..3037f1ce 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs @@ -326,6 +326,8 @@ public class Ghre_StudyRuleServices : BaseServices().FirstAsync(x => x.Id == ruleId); var ZoneIds = new List(); @@ -399,6 +401,12 @@ public class Ghre_StudyRuleServices : BaseServices().Where(x => x.DataBelongNo == "BLT01").AnyAsync(); + + #endregion + var staffs = await Db.Queryable() .WhereIF(inStaffIds.Any(), x => inStaffIds.Contains(x.StaffID)) .Where(x => x.OutDate == null || (x.OutDate != null && x.Indate != null && x.Indate.Value.Date <= DateTime.Now.Date && x.Indate.Value.Date >= DateTime.Now.Date)) @@ -409,6 +417,7 @@ public class Ghre_StudyRuleServices : BaseServices JobIds.Contains(x.JobID)) .WhereIF(!ruleStaffIds.IsNull() && ruleStaffIds.Any(), x => ruleStaffIds.Contains(x.StaffID)) .WhereIF(rule.DataBelongID.IsNotEmptyOrNull(), x => x.DataBelongID == rule.DataBelongID) + .WhereIF(isFliterTempStaff, x => x.Reverse16 != "03") .ToListAsync(); if (staffs.Any())