From b8607f49fb2ec4a4113aeb01455e90ae83781bcc Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 27 五月 2026 17:11:24 +0800
Subject: [PATCH] 增加餐补夜补，计算薪资
---
src/main/resources/mapper/staff/StaffOnJobMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index 90825e3..6751a99 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -74,6 +74,9 @@
<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">
@@ -98,6 +101,9 @@
<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>
--
Gitblit v1.9.3