From ad1aeb59db293e459695b131323fd0caa58e7be1 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 08 五月 2025 18:59:34 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~yhj/HM_JK
---
StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs b/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs
index 39938f7..85a2730 100644
--- a/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs
@@ -234,8 +234,8 @@
FDOCUMENTSTATUS = staff.FDocumentStatus,
FforbidStatus = staff.FForbidStatus,
CreateOrg = Convert.ToDecimal(staff.FCreateOrgId),
- UseOrg = Convert.ToDecimal(staff.FUseOrgId),
- FGZZZ=staff.FGZZZ
+ UseOrg = Convert.ToDecimal(staff.FUseOrgId),
+ Type = staff.Type,
};
//鍒犻櫎 2025-01-04 姹犲崡楠�
@@ -265,6 +265,7 @@
new MesStaffPositionLink
{
StaffId = Convert.ToDecimal(staff.Id),
+ GZZZ= staffDetail.FGZZZ,
PositionId =
string.IsNullOrEmpty(staffDetail.fPostId.ToString())
? null
--
Gitblit v1.9.3