From 9e5c392acb19838c263a569b09bb56da94bdbbf6 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 05 一月 2026 10:49:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd' into sqd
---
src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
index 7368456..d00b3c4 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
@@ -192,7 +192,7 @@
// 閫氳繃閮ㄩ棬鍚嶇О鏌ヨ閮ㄩ棬id
for (StaffJoinLeaveRecord staffJoinLeaveRecord : staffJoinLeaveRecords) {
staffJoinLeaveRecord.setStaffState(1);
- Optional<DeptPosition> deptPosition = deptPositions.stream().filter(deptPosition1 -> deptPosition1.getName().equals(staffJoinLeaveRecord.getDeptPositionName())).findFirst();
+ Optional<DeptPosition> deptPosition = deptPositions.stream().filter(deptPosition1 -> deptPosition1.getName().equals(staffJoinLeaveRecord.getPostJob())).findFirst();
deptPosition.ifPresent(position -> staffJoinLeaveRecord.setDeptPositionId(position.getId()));
add(staffJoinLeaveRecord);
}
--
Gitblit v1.9.3