From 7f616cfc0eeb35dd08cbd070b81661d351386c95 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 17:36:56 +0800
Subject: [PATCH] yys
---
src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml | 3 +++
src/main/resources/mapper/staff/StaffOnJobMapper.xml | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
index 991e1b6..41ccd83 100644
--- a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
+++ b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
@@ -12,6 +12,9 @@
<if test="staffJoinLeaveRecord.staffName != null and staffJoinLeaveRecord.staffName != '' ">
AND t1.staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
</if>
+ <if test="staffOnJob.deptPositionId != null">
+ AND t1.dept_position_id = #{staffOnJob.deptPositionId}
+ </if>
<if test="staffJoinLeaveRecord.entryDateStart != null and staffJoinLeaveRecord.entryDateStart != '' ">
and t1.contract_start_time like concat('%',#{staffJoinLeaveRecord.entryDateStart},'%')
</if>
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index 643050d..613f2c1 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -14,6 +14,7 @@
<if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
AND t1.staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
</if>
+
<if test="staffOnJob.entryDateStart != null and staffOnJob.entryDateStart != '' ">
AND t1.contract_expire_time >= DATE_FORMAT(#{staffOnJob.entryDateStart},'%Y-%m-%d')
</if>
--
Gitblit v1.9.3