diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/PersonController.cs index 245926a5..22836e09 100644 --- a/SGGL/WebAPI/Controllers/PersonController.cs +++ b/SGGL/WebAPI/Controllers/PersonController.cs @@ -779,7 +779,7 @@ namespace WebAPI.Controllers var responeData = new Model.ResponeData(); try { - responeData.data = (from x in Funs.DB.SitePerson_Person_Bak + responeData.data = (from x in Funs.DB.SitePerson_Person join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId where x.ProjectId == projectId && !x.ExchangeTime.HasValue @@ -831,7 +831,7 @@ namespace WebAPI.Controllers { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - responeData.data = (from x in db.SitePerson_Person_Bak + responeData.data = (from x in db.SitePerson_Person where x.ProjectId == projectId && x.InTime.HasValue && x.InTime < DateTime.Now && ((x.IsUsed == true && !x.OutTime.HasValue) || x.OutTime.HasValue) && !x.ExchangeTime2.HasValue && x.ExchangeTime.HasValue @@ -886,7 +886,7 @@ namespace WebAPI.Controllers db.SubmitChanges(); } - var getPersonb = db.SitePerson_Person_Bak.FirstOrDefault(e => e.PersonId == personId); + var getPersonb = db.SitePerson_Person.FirstOrDefault(e => e.PersonId == personId); if (getPersonb != null && !string.IsNullOrEmpty(type)) { if (type == "1")