From 096f6025e0212b23df8485b56818c3f0b019aa26 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期二, 20 四月 2021 10:40:31 +0800
Subject: [PATCH] 修复导入空行的问题
---
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 e13db54..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, (select dept_Name from t_dept as dept where dept.dept_Id= a.deptId) as newDeptName,a.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