合并最新

This commit is contained in:
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -292,7 +292,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
string allStaffData = string.Empty;
var allSum = from x in Funs.DB.SitePerson_Person
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == unitId && x.IsUsed == true
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == unitId && x.IsUsed == 1
&& (x.InTime < compileDate.AddMonths(1) || !x.InTime.HasValue)
select x;