合并最新

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
@@ -172,7 +172,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
var units = from x in Funs.DB.Base_Unit select x;
var sitePersons = from x in Funs.DB.SitePerson_Person
where x.ProjectId == this.ProjectId && x.IsUsed && !x.OutTime.HasValue
where x.ProjectId == this.ProjectId && x.IsUsed==1 && !x.OutTime.HasValue
select x;
for (int i = 0; i < ir; i++)
{
@@ -354,7 +354,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
var units = from x in Funs.DB.Base_Unit select x;
var sitePersons = from x in Funs.DB.SitePerson_Person
where x.ProjectId == this.ProjectId && x.IsUsed && !x.OutTime.HasValue
where x.ProjectId == this.ProjectId && x.IsUsed==1 && !x.OutTime.HasValue
select x;
for (int i = 0; i < ir; i++)
{