Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK

cnf

2025-05-09 af3455bc13c0ed48f4e3fa1b1614f601df24f12c

 StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs

@@ -228,13 +228,14 @@
            /// - 二次修改，删除
            /// </remarks>
            //PositionCode = staff.FPostId,
            PhoneNumber = staff.FMobile,
            CreateOrg = Convert.ToDecimal(staff.FCreateOrgId),
            UseOrg = Convert.ToDecimal(staff.FUseOrgId),
            PhoneNumber = staff.FMobile, 
            CreateDate = DateTime.Now,
            Remark = staff.FDescription,
            FDOCUMENTSTATUS = staff.FDocumentStatus,
            FforbidStatus = staff.FForbidStatus
            FforbidStatus = staff.FForbidStatus,
            CreateOrg = Convert.ToDecimal(staff.FCreateOrgId),
            UseOrg = Convert.ToDecimal(staff.FUseOrgId), 
            Type = staff.Type,
        };

        //删除  2025-01-04  池南骏
@@ -264,6 +265,7 @@
                new MesStaffPositionLink
                {
                    StaffId = Convert.ToDecimal(staff.Id),
                    GZZZ= staffDetail.FGZZZ,
                    PositionId =
                        string.IsNullOrEmpty(staffDetail.fPostId.ToString())
                            ? null