DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
wangyu
2026-07-08 18:12:46 +08:00
parent 73564a0db6 b6d4dcdde8
commit 349f06b22b
3 changed files with 93 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fad-hrm/src/main/resources/mapper/HrmEmployeeMapper.xml
View File

@@ -51,13 +51,15 @@
<sql id="selectVo">
SELECT
e.emp_id, e.user_id, e.emp_no, e.emp_name, e.gender, e.mobile, e.email, e.id_no,
e.hire_date, e.employment_type, e.status, su.dept_id, e.post_id, e.remark,
e.hire_date, e.employment_type, e.status,
COALESCE(e.dept_id, su.dept_id) AS dept_id,
e.post_id, e.remark,
e.create_by, e.create_time, e.update_by, e.update_time,
d.dept_name,
p.post_name
FROM hrm_employee e
left join sys_user su on su.user_id = e.user_id
LEFT JOIN sys_dept d ON su.dept_id = d.dept_id AND d.del_flag = 0
LEFT JOIN sys_user su ON su.user_id = e.user_id
LEFT JOIN sys_dept d ON d.dept_id = COALESCE(e.dept_id, su.dept_id) AND d.del_flag = 0
LEFT JOIN sys_post p ON e.post_id = p.post_id
WHERE e.del_flag = 0
</sql>