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())