From 28187d584b00856bb1961b7ce6ebd168ef1aded7 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期四, 13 五月 2021 18:11:17 +0800
Subject: [PATCH] 修改bug

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml
index 87d9445..801c062 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml
@@ -2,6 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpDimissionLogMapper">
     <select id="selectPageVo" resultType="java.util.Map">
-        select a.*,b.empNumb,b.certificateNumb,,b.empName  (select dept_Name from t_dept as dept where dept.dept_Id= b.deptId) as newDeptName,b.jobName as newJobName from t_emp_dimissionlog a inner join t_emp_baseinfo b on a.empId = b.empId ${ew.customSqlSegment}
+        select a.*,b.empNumb,b.certificateNumb,b.empName,
+        (select dept_Name from t_dept as dept where dept.dept_Id= b.deptId) as newDeptName,
+        (select allDeptName from t_dept as dept where dept.dept_Id= b.deptId) as allDeptName,
+        b.jobName as newJobName from t_emp_dimissionlog 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