Commit 8120dfc2 by 284718418@qq.com

修改员工假期BUG

parent 3ee29d6b
...@@ -100,11 +100,11 @@ ...@@ -100,11 +100,11 @@
emp.org_code AS orgcode, emp.org_code AS orgcode,
IFNULL(c. NAME, '') AS department, IFNULL(c. NAME, '') AS department,
IFNULL(emp.rz_time, '') AS rztime, IFNULL(emp.rz_time, '') AS rztime,
IFNULL((select em.job_status from yggl_main_lzb em where em.emp_num = emp.emp_num and em.org_code = emp.org_code),0) as turnover_status IFNULL(emp.job_status,0) as turnover_status
FROM yggl_main_lzb emp FROM yggl_main_lzb emp
LEFT JOIN zzgl_bmgw_m AS gw ON gw.id = emp.bmgw_id LEFT JOIN zzgl_bmgw_m AS gw ON gw.id = emp.bmgw_id
LEFT JOIN zzgl_bmgw_m AS c ON c.id = gw.up_id LEFT JOIN zzgl_bmgw_m AS c ON c.id = gw.up_id
WHERE 1=1 WHERE emp.job_status = 3
<if test="param.query != null and param.query != ''"> <if test="param.query != null and param.query != ''">
and ( emp.`name` like CONCAT('%',#{param.query},'%') or and ( emp.`name` like CONCAT('%',#{param.query},'%') or
emp.emp_num like CONCAT('%',#{param.query},'%') or emp.emp_num like CONCAT('%',#{param.query},'%') or
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
and c.id in (select m.id from zzgl_bmgw_m m where m.up_id = #{param.deptid}) or (c.id =#{param.deptid}) and c.id in (select m.id from zzgl_bmgw_m m where m.up_id = #{param.deptid}) or (c.id =#{param.deptid})
</if> </if>
and emp.org_code = #{param.orgCode} and emp.org_code = #{param.orgCode}
AND emp.job_status = 3
</if> </if>
<!--and c.id = #{param.deptid} <!--and c.id = #{param.deptid}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment