合并上格最新代码

展杰

2024-08-16 3dfa3d93337cca6363b0e138c74f80af96431b83

 MES.Service/service/BasicData/MesStaffManager.cs

@@ -1,4 +1,5 @@
using MES.Service.DB;
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -65,9 +66,9 @@
        if (exists)
        {
            var updateUser = db.Updateable<SysUser>()
                .SetColumns(s=>s.Fcode == sysUser.Fcode)
                .SetColumns(s=>s.Fname == sysUser.Fname)
                .Where(s=>s.Sid == sysUser.Sid)
                .SetColumns(s => s.Fcode == sysUser.Fcode)
                .SetColumns(s => s.Fname == sysUser.Fname)
                .Where(s => s.Sid == sysUser.Sid)
                .ExecuteCommand();
            if (updateUser > 0)
            {
@@ -118,7 +119,11 @@
            PositionName = staff.FPost,
            PhoneNumber = staff.FMobile,
            Remark = staff.FDescription,
            FforbidStatus = staff.FForbidStatus
            FforbidStatus = staff.FForbidStatus,
            FSubsidiary = staff.FSubsidiary,
            Fumbrella = staff.Fumbrella,
            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
        };

        if (staff.FStaffStartDate != null)
@@ -137,11 +142,19 @@
            Fcode = staff.FStaffNumber,
            Fname = staff.FName,
            Fpassword = "8+()./,", // 初始密码
            Fsystem = "上格",
            Fsystem = "夏蒙",
            Lever = 0,
            Fcompany = "1000",
            Ffactory = "1000",
            DelFlag = 0
            DelFlag = 0,
            Ismanager = 0,
            Isacq = 0,
            ExpField9 = "1020",
            QmUser = 0,
            Status = 0,
            Isdeparture = 0,
            CheckFlag = 0,
            ExpFiel12 = 0
        };
    }