From e435c834aac75f49cf2d1945bd4f849524e8b59c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 16 一月 2026 18:00:15 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New
---
src/main/resources/mapper/staff/StaffOnJobMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index 71eb981..6e0a956 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -22,12 +22,15 @@
AND contract_expire_time <= DATE_FORMAT(#{staffOnJob.entryDateEnd},'%Y-%m-%d')
</if>
</select>
- <select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffOnJob">
+ <select id="staffOnJobList" resultType="com.ruoyi.staff.dto.StaffOnJobDto">
SELECT
- *
+ staff_on_job.*,
+ sp.post_name as postName
FROM staff_on_job
+ LEFT JOIN
+ sys_post sp ON sp.post_id = staff_on_job.sys_post_id
where 1=1
- <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
+ <if test="staffOnJob.staffState != null">
AND staff_state = #{staffOnJob.staffState}
</if>
<if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
--
Gitblit v1.9.3