From 44e0f0472d8efa0646b20db8a40c16beab0b752e Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 06 四月 2024 12:22:12 +0800
Subject: [PATCH] feat: 一些需求改进 打开档案时增加了部门选择项 处理了合同信息录入时的性别不自动填入问题 合同到期提醒模块发布
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
index 17ddca5..4935aa4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
@@ -13,9 +13,10 @@
FROM t_label label where label.delFlag = 0 order by label.sort)) as querySql
</select>
<select id="selectPageVo" resultType="java.util.Map">
- select a.delFlag,a.empName,a.empStatus,a.empId,a.empNumb,a.age,a.archivesStatus,a.sex,a.insuranceType,a.politics,a.education,a.entryDate,a.certificateNumb,
- (select dept_Name from t_dept as dept where dept.dept_Id= a.deptId) as deptName,a.jobName from t_emp_baseinfo a
+ select a.delFlag,a.empName,a.empStatus,a.empId,a.certificateNumb,a.empNumb,
+ (select allDeptName from t_dept as dept where dept.dept_Id= a.deptId) as deptName,a.jobName from t_emp_baseinfo a
inner join t_dept c on a.deptId = c.DEPT_ID
+ left join t_emp_accessory acc on acc.empId = a.empId
${ew.customSqlSegment}
</select>
--
Gitblit v1.8.0