qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

兼容0状态档案

This commit is contained in:
钱涛 2025-01-21 10:20:16 +08:00
parent b206fd984c
commit 7195dc7618
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
View File

@ -117,7 +117,7 @@
LEFT JOIN hrmdepartment d ON d.id = e.departmentid LEFT JOIN hrmdepartment d ON d.id = e.departmentid
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
WHERE t.delete_type = 0 WHERE t.delete_type = 0
and t.employee_type is null and (t.employee_type is null or t.employee_type = 0)
and e.status not in (7) and e.status not in (7)
<if test="param.ids != null and param.ids.size()>0"> <if test="param.ids != null and param.ids.size()>0">
@ -221,7 +221,7 @@
LEFT JOIN hrmdepartment d ON d.id = e.departmentid LEFT JOIN hrmdepartment d ON d.id = e.departmentid
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
WHERE t.delete_type = 0 WHERE t.delete_type = 0
and t.employee_type is null and (t.employee_type is null or t.employee_type = 0)
and e.status not in (7) and e.status not in (7)
<if test="param.ids != null and param.ids.size()>0"> <if test="param.ids != null and param.ids.size()>0">
@ -322,7 +322,7 @@
LEFT JOIN hrmdepartment d ON d.id = e.departmentid LEFT JOIN hrmdepartment d ON d.id = e.departmentid
LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
WHERE t.delete_type = 0 WHERE t.delete_type = 0
and t.employee_type is null and (t.employee_type is null or t.employee_type = 0)
and e.status not in (7) and e.status not in (7)
<if test="param.ids != null and param.ids.size()>0"> <if test="param.ids != null and param.ids.size()>0">