From 141c6c9e9b9d66b0a36da98c7493037d28fccfca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 5 Aug 2025 14:40:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=B4=E4=BF=AE=E5=90=84?=
 =?UTF-8?q?=E4=B8=AA=E5=8A=9F=E8=83=BD=E8=AE=A1=E5=88=92=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=8F=8F=E8=BF=B0=E6=9F=A5=E8=AF=A2=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/pms/EamMapper.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index ff2fff40..529e3b51 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -869,12 +869,12 @@
         a.ActualDate,
         a.FunctionType,
         a.CreateDate,
-        d.operator_name as createBy,
+        dbo.eam_Get_eamAdminName_TPM(a.Site,a.CreateBy) as createBy,
         a.Remark,
         a.StartTime,
         a.EndTime,
         a.WorkTime,
-        dbo.eam_Get_eamAdminName(a.Site,a.PlanOperator) as PlanOperatorName,
+        dbo.eam_Get_eamAdminName_TPM(a.Site,a.PlanOperator) as PlanOperatorName,
         a.checkerName,
         dbo.eam_Get_eamAdminName(a.Site, a.ActualOperator) as actualOperatorName,
         eo.ObjectDesc as objectDesc,
@@ -1013,12 +1013,12 @@
                 a.ActualDate,
                 a.FunctionType,
                 a.CreateDate,
-                d.operator_name as createBy,
+                dbo.eam_Get_eamAdminName_TPM(a.Site,a.CreateBy) as createBy,
                 a.Remark,
                 a.StartTime,
                 a.EndTime,
                 a.WorkTime,
-                dbo.eam_Get_eamAdminName(a.Site,a.PlanOperator) as planOperatorName,
+                dbo.eam_Get_eamAdminName_TPM(a.Site,a.PlanOperator) as planOperatorName,
                 b.DefectID,
                 c.DefectDesc,
                 e.ObjectDesc as objectDesc,
@@ -1645,12 +1645,12 @@
             a.deleteFlag,
             a.CreatedDate,
             a.CreatedBy,
-            c.operator_name as feedbackBy,
+            dbo.eam_Get_eamAdminName_TPM(a.site,a.CreatedBy) as feedbackBy,
             a.UpdateDate,
             a.UpdateBy,
             a.Version,
             a.DefectDate,
-            dbo.eam_Get_eamAdminName(a.Site,a.PlanOperator) as PlanOperatorName,
+            dbo.eam_Get_eamAdminName_TPM(a.Site,a.PlanOperator) as PlanOperatorName,
             b.defectDesc,
             e.ObjectDesc as ObjectDesc,
             FinishDate,