From a065c7369db242c390f0ec6e5b82b087a6bd836e Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 2 Aug 2023 17:39:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E5=8F=B0=E8=B4=A6=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/organization/mapper/job/JobMapper.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml
index 91b79acd..38a12f48 100644
--- a/src/com/engine/organization/mapper/job/JobMapper.xml
+++ b/src/com/engine/organization/mapper/job/JobMapper.xml
@@ -330,6 +330,8 @@
         b.departmentname ,
         c.sequence_name,
         d.scheme_name,
+        e.jobactivityname,
+        f.jobgroupname,
         <include refid="baseColumns"/>
         FROM jcl_org_job t
         left join hrmjobtitles h on
@@ -342,6 +344,9 @@
         t.sequence_id = c.id
         left join jcl_org_scheme d on
         t.scheme_id = d.id
+        left join hrmjobtitles h on t.ec_jobTitle = h.id
+        left join hrmjobactivities e on h.jobactivityid =e.id
+        left join hrmjobgroups f on e.jobgroupid =f.id
         WHERE t.delete_type = 0
         <include refid="likeSQL"/>
         <if test=" jobPO.parentJob != null ">