fix(hrm): 修复部门负责人配置功能,优化部门关联逻辑
1. 修复员工部门ID优先使用自定义字段而非用户绑定部门的逻辑 2. 新增部门负责人弹窗配置功能,支持直接编辑部门负责人、联系方式 3. 调整部门关联查询的JOIN条件,使用COALESCE正确获取部门ID 4. 为无负责人的部门标签添加点击阻止冒泡,避免触发树节点展开
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user