qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/240702-编辑核算时人员信息' into release/2.15.1.2407.01

This commit is contained in:
Harryxzy 2024-08-01 10:53:29 +08:00
parent 241a85c711 8bbf8f3ff6
commit 8d057e2706
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
View File

@ -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;

2
src/com/engine/salary/mapper/datacollection/EmployMapper.xml
View File

@ -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>