From e4c10a806ff29d18cdbdd182a5930316eae3fd83 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 07 四月 2026 09:29:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_新疆_大罗素马铃薯
---
src/main/resources/mapper/staff/StaffOnJobMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index fe35886..b0c85bc 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -5,12 +5,14 @@
SELECT
staff_on_job.*,
sp.post_name as postName,
- sd.dept_name as deptName
+ sd.dept_name as deptName,
+ t1.contract_start_time
FROM staff_on_job
LEFT JOIN
sys_post sp ON sp.post_id = staff_on_job.sys_post_id
LEFT JOIN
sys_dept sd ON sd.dept_id = staff_on_job.sys_dept_id
+ LEFT JOIN staff_contract as t1 ON t1.staff_on_job_id = staff_on_job.id
where 1=1
<if test="staffOnJob.staffState != null">
AND staff_state = #{staffOnJob.staffState}
--
Gitblit v1.9.3