From 8bbf8f3ff61fd67c6c90c09cdfa0630de25691a2 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Thu, 1 Aug 2024 10:52:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E6=97=B6=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=81=8C=E7=A7=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java | 3 +++
 src/com/engine/salary/mapper/datacollection/EmployMapper.xml   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
index 268da68d4..005b6ddd0 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
@@ -498,6 +498,9 @@ public class SalaryAcctResultBO {
                         Map<String, String> fieldValueMap = new HashMap<>();
                         fieldValueMap.put("id", employeeFieldValueMap.getOrDefault(codeKey + "Id", StringUtils.EMPTY));
                         fieldValueMap.put("name", employeeFieldValueMap.getOrDefault(codeKey + "Name", StringUtils.EMPTY));
+                        if (codeKey.equals("jobcall")) {
+                            fieldValueMap.put("name", employeeFieldValueMap.getOrDefault( "jobcall", StringUtils.EMPTY));
+                        }
                         dto.setFieldValue(fieldValueMap);
                     }
                     return dto;
diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
index e19952e21..ae903a6a7 100644
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
@@ -611,7 +611,7 @@
 
     <select id="getJobCallInfoById" resultType="com.engine.salary.entity.hrm.JobCallInfo">
         select job.id,
-               job.jobtitlename as name
+               job.NAME as name
         from hrmjobcall job
         where job.id = #{jobCallId}
     </select>