From b97dc921008fc61a7e0d9de04dbce2956e65e178 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期二, 10 三月 2026 12:46:53 +0800
Subject: [PATCH] feat(hr): 添加员工转正和退休管理功能
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpWorkExperienceMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 52396cc..3513f49 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,9 +3,9 @@
<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 b.deptId = c.DEPT_ID
+ inner join t_dept c on a.deptId = c.DEPT_ID
${ew.customSqlSegment}
</select>
--
Gitblit v1.8.0