Merge remote-tracking branch 'remotes/origin/fix/230801-无法生成薪资、社保档案' into release/2.9.2.2307.02

2023-08-04 15:18:10 +08:00 · 2023-08-04 15:18:10 +08:00 · cedb49833c
parent 9488823307 6dd6eca3bf
commit cedb49833c
1 changed files with 2 additions and 0 deletions
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
@ -233,8 +233,10 @@
               e.mobile           as mobile,
               e.subcompanyid1    as subcompanyid,
               e.departmentid     as departmentId,
+               d.DEPARTMENTNAME   as departmentName,
               e.jobtitle         as jobtitleId
        from hrmresource e
+        left join hrmdepartment d on e.departmentid = d.id
        where e.status not in (7)
          and (e.accounttype is null or e.accounttype = 0)
    </select>