From 6d05ae432c4d76e521e031a76232a6dd1b0ff105 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 09 三月 2021 09:20:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
index eda4747..a734f8c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
@@ -3,6 +3,15 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper">
<select id="selectPageVo" resultType="java.util.Map">
- select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a inner join t_emp_baseinfo b on a.empId = b.empId ${ew.customSqlSegment}
+ select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a
+ inner join t_emp_baseinfo b on a.empId = b.empId
+ inner join t_dept c on b.deptId = c.DEPT_ID
+ ${ew.customSqlSegment}
+ </select>
+ <select id="selectPageVoBean" resultType="cc.mrbird.febs.server.hr.entity.EmpJobChange">
+ select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a
+ inner join t_emp_baseinfo b on a.empId = b.empId
+ inner join t_dept c on b.deptId = c.DEPT_ID
+ ${ew.customSqlSegment}
</select>
</mapper>
--
Gitblit v1.8.0