From 75b7a414ef821a07426790cb79c37811ae2f07ac Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 27 一月 2026 10:42:20 +0800
Subject: [PATCH] 浪潮对接单点登录:mis管理系统配置修改
---
src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java | 21 +--------------------
1 files changed, 1 insertions(+), 20 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 d20ee41..f82ecc8 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
@@ -24,8 +24,6 @@
import java.util.*;
import java.util.function.Function;
-import static com.ruoyi.common.enums.StaffJoinLeaveRecordDimissionReason.StaffJoinLeaveRecordDimissionReasonOther;
-
@Service
@AllArgsConstructor
@Transactional(rollbackFor = Exception.class)
@@ -79,12 +77,6 @@
staffOnJobMapper.updateById(staffOnJob);
}else {
throw new BaseException("娌℃湁鎵惧埌"+staffJoinLeaveRecord.getStaffNo()+"缂栧彿鐨勫憳宸�,鏃犳硶鏂板绂昏亴!!!");
- }
- if (staffJoinLeaveRecord.getDimissionReason()==null){
- throw new BaseException("绂昏亴鍘熷洜涓嶈兘涓虹┖!!!");
- }
- if (!StaffJoinLeaveRecordDimissionReasonOther.getCode().equals(staffJoinLeaveRecord.getDimissionReason())){
- staffJoinLeaveRecord.setDimissionRemark("");
}
}
return staffJoinLeaveRecordMapper.insert(staffJoinLeaveRecord);
@@ -163,25 +155,14 @@
/*鍏ヨ亴*/
StaffOnJob job = staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery()
.eq(StaffOnJob::getStaffNo, staffJoinLeaveRecord.getStaffNo())).get(0);
- // 澧炲姞浜嗗悎鍚屾柟妗堟墍浠ュ幓鎺夎繖涓垽鏂�
//濡傛灉鏇存敼鐨勫悎鍚屽埌鏈熸椂闂存洿涔呭垯鏇存柊,濡傛灉娌℃湁灏变笉鐢ㄦ洿鏂�
-// if (staffJoinLeaveRecord.getContractEndTime().compareTo(job.getContractExpireTime())>0) {
-// BeanUtils.copyProperties(staffJoinLeaveRecord,job,ignoreProperties);
-// staffOnJobMapper.updateById(job);
-// }
- if(job != null){
+ if (staffJoinLeaveRecord.getContractEndTime().compareTo(job.getContractExpireTime())>0) {
BeanUtils.copyProperties(staffJoinLeaveRecord,job,ignoreProperties);
staffOnJobMapper.updateById(job);
}
}else {
/*绂昏亴*/
//绂昏亴鐨勭紪杈戜笉浼氬奖鍝嶅湪鑱岃〃
- if (staffJoinLeaveRecord.getDimissionReason()==null){
- throw new BaseException("绂昏亴鍘熷洜涓嶈兘涓虹┖!!!");
- }
- if (!StaffJoinLeaveRecordDimissionReasonOther.getCode().equals(staffJoinLeaveRecord.getDimissionReason())){
- staffJoinLeaveRecord.setDimissionRemark("");
- }
}
return staffJoinLeaveRecordMapper.updateById(staffJoinLeaveRecord);
}
--
Gitblit v1.9.3