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/EmpDimissionLogMapper.xml |    1 +
 1 files changed, 1 insertions(+), 0 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 25a2360..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
@@ -4,6 +4,7 @@
     <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,
+        (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

--
Gitblit v1.8.0