From effd0715ce2f89172015359da2c2406236598cfa Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期二, 25 三月 2025 18:13:31 +0800
Subject: [PATCH] 1
---
MES.Service/service/BasicData/MesStaffManager.cs | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index 34eafdf..71aecb0 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -58,18 +58,31 @@
}
// 鎻掑叆鎴栨洿鏂板憳宸ョ殑鏂规硶
- private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser,
- MesStaff entity)
+ private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser,MesStaff entity)
{
var exists = db.Queryable<SysUser>().Any(u => u.Sid == sysUser.Sid);
if (exists)
{
- var updateUser = db.Updateable(sysUser).ExecuteCommand();
+ var updateUser = db.Updateable<SysUser>()
+ .SetColumns(s => s.Fcode == sysUser.Fcode)
+ .SetColumns(s => s.Fname == sysUser.Fname)
+ .Where(s => s.Sid == sysUser.Sid)
+ .ExecuteCommand();
if (updateUser > 0)
{
var updateStaff = db.Updateable(entity).ExecuteCommand();
if (updateStaff > 0)
+ {
return true;
+ }
+ else
+ {
+ var insertStaff = db.Insertable(entity).ExecuteCommand();
+ if (insertStaff > 0)
+ {
+ return true;
+ }
+ }
}
}
else
@@ -110,9 +123,12 @@
Id = Convert.ToDecimal(staff.Id),
StaffNo = staff.FStaffNumber,
StaffName = staff.FName,
- DepartmentName = staff.FPostDept,
- PositionName = staff.FPost,
+ DepartmentNo = staff.FPostDept,
+ PositionCode = staff.FPostId,
PhoneNumber = staff.FMobile,
+ CreateOrg = Convert.ToDecimal(staff.FCreateOrgId),
+ UseOrg = Convert.ToDecimal(staff.FUseOrgId),
+ CreateDate = DateTime.Now,
Remark = staff.FDescription,
FforbidStatus = staff.FForbidStatus
};
@@ -133,11 +149,25 @@
Fcode = staff.FStaffNumber,
Fname = staff.FName,
Fpassword = "8+()./,", // 鍒濆瀵嗙爜
- Fsystem = "涓婃牸",
+ Fsystem = "鐓滄槍",
Lever = 0,
Fcompany = "1000",
Ffactory = "1000",
- DelFlag = 0
+ DelFlag = 0,
+ Dev=0,
+ Tet=0,
+ Prd=1,
+ Ismanager = 0,
+ Isacq = 0,
+ ExpField9 = "1020",
+ QmUser = 0,
+ Status = 0,
+ Isdeparture = 0,
+ CheckFlag = 0,
+ ExpFiel12 = 0,
+ FirstLogin = 0,
+ CreateDate = DateTime.Now,
+ PswEditTime = DateTime.Now
};
}
--
Gitblit v1.9.3