From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治
---
src/main/resources/mapper/staff/StaffLeaveMapper.xml | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffLeaveMapper.xml b/src/main/resources/mapper/staff/StaffLeaveMapper.xml
index fef5c81..4637ff0 100644
--- a/src/main/resources/mapper/staff/StaffLeaveMapper.xml
+++ b/src/main/resources/mapper/staff/StaffLeaveMapper.xml
@@ -18,24 +18,18 @@
soj.emergency_contact as emergencyContact,
soj.emergency_contact_phone as emergencyContactPhone,
sp.post_name as postName,
- sd.dept_name as deptName,
- se.education as first_study,
- se.major as profession
+ sd.dept_name as deptName
FROM staff_leave
- LEFT JOIN staff_on_job soj ON soj.id = staff_leave.staff_on_job_id
- LEFT JOIN sys_post sp ON sp.post_id = soj.sys_post_id
- LEFT JOIN sys_dept sd ON sd.dept_id = soj.sys_dept_id
- LEFT JOIN staff_education se ON se.staff_on_job_id = staff_leave.staff_on_job_id
- AND se.id = (
- SELECT MAX(se2.id)
- FROM staff_education se2
- WHERE se2.staff_on_job_id = staff_leave.staff_on_job_id
- )
- WHERE 1=1
+ LEFT JOIN
+ staff_on_job soj ON soj.id = staff_leave.staff_on_job_id
+ LEFT JOIN
+ sys_post sp ON sp.post_id = soj.sys_post_id
+ LEFT JOIN
+ sys_dept sd ON sd.dept_id = soj.sys_dept_id
+ where 1=1
<if test="c.staffName != null and c.staffName != '' ">
AND soj.staff_name LIKE CONCAT('%',#{c.staffName},'%')
</if>
- order by staff_leave.create_time desc
</select>
<select id="staffLeaveList" resultType="com.ruoyi.staff.dto.StaffLeaveDto">
SELECT
@@ -62,12 +56,10 @@
sys_post sp ON sp.post_id = soj.sys_post_id
LEFT JOIN
sys_dept sd ON sd.dept_id = soj.sys_dept_id
- <where>
- <if test="c.staffName != null and c.staffName != '' ">
- AND soj.staff_name LIKE CONCAT('%',#{c.staffName},'%')
- </if>
- </where>
- order by staff_leave.create_time desc
+ where 1=1
+ <if test="c.staffName != null and c.staffName != '' ">
+ AND soj.staff_name LIKE CONCAT('%',#{c.staffName},'%')
+ </if>
</select>
<select id="staffLeaveReasonAnalytics" resultType="com.ruoyi.staff.dto.StaffLeaveDto">
--
Gitblit v1.9.3