Merge remote-tracking branch 'origin/master'

啊鑫

2025-07-07 79e43ccffd15afcd99934ee43b706f6133398079

 MES.Service/service/BasicData/MesStaffManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -119,9 +118,7 @@
            PositionName = staff.FPost,
            PhoneNumber = staff.FMobile,
            Remark = staff.FDescription,
            FforbidStatus = staff.FForbidStatus,
            FSubsidiary = staff.FSubsidiary,
            Fumbrella = staff.Fumbrella,
            FforbidStatus = staff.FForbidStatus
        };

        if (staff.FStaffStartDate != null)
@@ -144,7 +141,18 @@
            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,
            Dev = 0,
            Tet = 0,
            Prd = 1
        };
    }