diff --git a/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs b/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs index ab60031d..5e1c779e 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs @@ -198,6 +198,7 @@ namespace BLL InOutWay = personInOut.InOutWay ?? Const.InOutWay_Other, WorkAreaId = personInOut.WorkAreaId, WorkAreaName = personInOut.WorkAreaName, + IdentityCard = personInOut.IdentityCard, OldID = personInOut.OldID, Address = personInOut.Address, Remark = personInOut.Remark, @@ -210,7 +211,7 @@ namespace BLL { personIds.Add(personInOut.IdentityCard); } - newPersonInOutList.Add(personInOut); + newPersonInOutList.Add(newPersonInOut); } List person_Peoples = new List(); @@ -244,7 +245,7 @@ namespace BLL } } - if (!getPerson.OutTime.HasValue || getPerson.OutTime > DateTime.Now) + if (getPerson!=null && (!getPerson.OutTime.HasValue || getPerson.OutTime > DateTime.Now)) { //// 插入当日记录表 needInsertPersonInOutList.Add(newPersonInOut); diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/PersonController.cs index 35243ee1..fd9533c1 100644 --- a/SGGL/WebAPI/Controllers/PersonController.cs +++ b/SGGL/WebAPI/Controllers/PersonController.cs @@ -476,8 +476,9 @@ namespace WebAPI.Controllers { var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == person.IdentityCard.Trim() && x.ProjectId == person.ProjectId); if (getPerson != null && getPerson.PersonId != person.PersonId) + //if (getPerson != null && getPerson.SitePersonId != person.SitePersonId) { - responeData.code = 2; + responeData.code = 2; responeData.message = "人员身份证号码已存在!"; } else @@ -785,7 +786,7 @@ namespace WebAPI.Controllers catch (Exception ex) { responeData.code = 0; - responeData.message = ex.Message; + responeData.message = ex.StackTrace; } } return responeData;