From bb3139e62038f3c165253cf5724325092966be78 Mon Sep 17 00:00:00 2001
From: 孔 <1124498879@qq.com>
Date: 星期三, 23 六月 2021 14:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.xml
index f9f5181..78f2946 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpWorkExperienceMapper">
<select id="selectPageVo" resultType="cc.mrbird.febs.server.hr.entity.EmpWorkExperience">
- select a.* from t_emp_workExperience a
+ select a.*,b.allDeptName from t_emp_workExperience a
inner join t_emp_baseinfo b on a.empId = b.empId
inner join t_dept c on a.deptId = c.DEPT_ID
${ew.customSqlSegment}
--
Gitblit v1.8.0