From c5cf095903c50112f71612272911d53e9c86b7e0 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期五, 12 三月 2021 09:10:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpDimissionLogMapper.xml | 9 ++++++++-
1 files changed, 8 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 f311303..25a2360 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
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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
+ inner join t_dept c on b.deptId = c.DEPT_ID
+ ${ew.customSqlSegment}
+ </select>
</mapper>
--
Gitblit v1.8.0