From 18c13ba8900911f41a60df49125b4570b3852e0b Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 20 六月 2021 18:16:16 +0800
Subject: [PATCH] fix(bug修复): 证件查询从或改为与

---
 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..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,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,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,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>
 </mapper>

--
Gitblit v1.8.0