From b7e12f6bfcf7d42169dffa5f169843e714833b6a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 23 四月 2021 12:05:46 +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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 a734f8c..627c793 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,13 +3,13 @@
<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
+ select a.*,b.empNumb,b.certificateNumb,c.allDeptName 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
+ select a.*,b.empNumb,b.certificateNumb,c.allDeptName 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}
--
Gitblit v1.8.0