From cdd325cf78ca5bac74f941a917d8c90f34fa63e6 Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期一, 25 八月 2025 10:03:41 +0800 Subject: [PATCH] 11 --- MES.Service/service/BasicData/MesStaffManager.cs | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs index e54dd91..a0081d3 100644 --- a/MES.Service/service/BasicData/MesStaffManager.cs +++ b/MES.Service/service/BasicData/MesStaffManager.cs @@ -585,7 +585,9 @@ { var entity = new MesStaff { - Id = Convert.ToDecimal(staff.Id), + Id = string.IsNullOrEmpty(staff.Id) + ? DateTimeOffset.UtcNow.ToUnixTimeSeconds() + : Convert.ToDecimal(staff.Id), StaffNo = staff.FStaffNumber, StaffName = staff.FName, DepartmentName = staff.FPostDept, @@ -593,8 +595,12 @@ PhoneNumber = staff.FMobile, Remark = staff.FDescription, FforbidStatus = staff.FForbidStatus, - FSubsidiary = staff.FUseOrgId, - Fumbrella = staff.FCreateOrgId, + FSubsidiary = string.IsNullOrEmpty(staff.FUseOrgId) + ? "1" + : staff.FUseOrgId, + Fumbrella = string.IsNullOrEmpty(staff.FCreateOrgId) + ? "1" + : staff.FCreateOrgId, CreateDate = DateTime.Now, LastupdateDate = DateTime.Now, Type = staff.Type @@ -605,6 +611,15 @@ entity.StartDate = DateTime.ParseExact(staff.FStaffStartDate, "yyyy-MM-dd HH:mm:ss", null); } + var mesStaff = Db.Queryable<MesStaff>() + .Where(s => s.StaffNo == entity.StaffNo) + .First(); + + if (mesStaff != null) + { + entity.Id = mesStaff.Id; + } + return entity; } catch (Exception ex) -- Gitblit v1.9.3