From b333211261231c5dfdcaddaed6c1318834f0a8b8 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 21 一月 2026 10:58:05 +0800
Subject: [PATCH] 浪潮对接单点登录:能耗管理系统2
---
src/main/resources/mapper/staff/StaffOnJobMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index 71eb981..a43bb37 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -4,10 +4,13 @@
<select id="staffOnJobListPage" resultType="com.ruoyi.staff.dto.StaffOnJobDto">
SELECT
staff_on_job.*,
- sp.post_name as postName
+ sp.post_name as postName,
+ sd.dept_name as deptName
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
where 1=1
<if test="staffOnJob.staffState != null">
AND staff_state = #{staffOnJob.staffState}
@@ -22,12 +25,18 @@
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,
+ sd.dept_name as deptName
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
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