From 837f0af99207cbdcdaff930dd5cdede06ad677ae Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 27 五月 2026 15:29:19 +0800
Subject: [PATCH] 修改保存补贴配置
---
src/main/resources/mapper/staff/StaffOnJobMapper.xml | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index 2cbd1dc..6751a99 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -74,11 +74,15 @@
<if test="staffOnJob.sysDeptId != null">
AND staff_on_job.sys_dept_id = #{staffOnJob.sysDeptId}
</if>
+ <if test="staffOnJob.nation != null and staffOnJob.nation != '' ">
+ AND staff_on_job.nation = #{staffOnJob.nation}
+ </if>
</where>
GROUP BY staff_on_job.id
<if test="staffOnJob.contractStartTime != null">
HAVING MIN(t1.contract_start_time) = #{staffOnJob.contractStartTime}
</if>
+ order by staff_on_job.create_time desc
</select>
<select id="staffOnJobList" resultType="com.ruoyi.staff.dto.StaffOnJobDto">
SELECT
@@ -90,13 +94,18 @@
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}
- </if>
- <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
- </if>
+ <where>
+ <if test="staffOnJob.staffState != null">
+ AND staff_state = #{staffOnJob.staffState}
+ </if>
+ <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
+ AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
+ </if>
+ <if test="staffOnJob.nation != null and staffOnJob.nation != '' ">
+ AND staff_on_job.nation = #{staffOnJob.nation}
+ </if>
+ </where>
+ order by staff_on_job.create_time desc
</select>
<!-- 缁熻鎸囧畾鏃ユ湡鐨勫湪鑱屽憳宸ユ暟 -->
<select id="countOnJobStaffByDate" resultType="java.lang.Integer">
--
Gitblit v1.9.3