From 2154a6777af36576b2da5e969fb5116ce7ccda3e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 19 一月 2026 14:21:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java | 10 ----------
1 files changed, 0 insertions(+), 10 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 78f94b2..0b2eba7 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
@@ -19,13 +19,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
-import java.util.function.Function;
-import static com.ruoyi.common.enums.StaffJoinLeaveRecordDimissionReason.StaffJoinLeaveRecordDimissionReasonOther;
@Service
@AllArgsConstructor
@@ -83,9 +79,6 @@
}
if (staffJoinLeaveRecord.getDimissionReason()==null){
throw new BaseException("绂昏亴鍘熷洜涓嶈兘涓虹┖!!!");
- }
- if (!StaffJoinLeaveRecordDimissionReasonOther.getCode().equals(staffJoinLeaveRecord.getDimissionReason())){
- staffJoinLeaveRecord.setDimissionRemark("");
}
}
return staffJoinLeaveRecordMapper.insert(staffJoinLeaveRecord);
@@ -179,9 +172,6 @@
//绂昏亴鐨勭紪杈戜笉浼氬奖鍝嶅湪鑱岃〃
if (staffJoinLeaveRecord.getDimissionReason()==null){
throw new BaseException("绂昏亴鍘熷洜涓嶈兘涓虹┖!!!");
- }
- if (!StaffJoinLeaveRecordDimissionReasonOther.getCode().equals(staffJoinLeaveRecord.getDimissionReason())){
- staffJoinLeaveRecord.setDimissionRemark("");
}
}
return staffJoinLeaveRecordMapper.updateById(staffJoinLeaveRecord);
--
Gitblit v1.9.3