From 135530d3b7e67bf6c9e073c561f2e77b3a0d018c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 20 Apr 2023 17:55:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=87=8F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/mapper/datacollection/EmployMapper.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
index 806a1bf2d..794b1491a 100644
--- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
+++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml
@@ -172,9 +172,12 @@
                c.id               as jobtitleId,
                e.companystartdate as companystartdate,
                e.mobile           as mobile,
-               e.enddate          as dismissdate
+               e.enddate          as dismissdate,
+               sc.SUBCOMPANYNAME as subcompanyName,
+               sc.id as subcompanyid,
         from hrmresource e
                  left join hrmdepartment d on e.departmentid = d.id
+                 left join HrmSubCompany sc on e.SUBCOMPANYID1=sc.id
                  left join hrmjobtitles c on e.jobtitle = c.id
         where e.status not in (7)
           and (e.accounttype is null or e.accounttype = 0)