From a332ffab46b0d30e85b73ec023aa4e30c7b69e52 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 12 三月 2021 02:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.xml
index e7789ae..e1d808c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.xml
@@ -2,4 +2,11 @@
 <!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.EmpContractInfoMapper">
 
+	<select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpContractInfo">
+        select a.*,b.allDeptName from t_emp_contractinfo 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