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 | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 378a1f1..0b2eba7 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.staff.dto.StaffJoinLeaveRecordDto;
import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
@@ -18,11 +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;
+
@Service
@AllArgsConstructor
@@ -35,7 +34,7 @@
//鍒嗛〉鏌ヨ
@Override
- public IPage<StaffJoinLeaveRecord> staffJoinLeaveRecordListPage(Page page, StaffJoinLeaveRecord staffJoinLeaveRecord) {
+ public IPage<StaffJoinLeaveRecordDto> staffJoinLeaveRecordListPage(Page page, StaffJoinLeaveRecord staffJoinLeaveRecord) {
return staffJoinLeaveRecordMapper.staffJoinLeaveRecordListPage(page,staffJoinLeaveRecord);
}
@@ -77,6 +76,9 @@
staffOnJobMapper.updateById(staffOnJob);
}else {
throw new BaseException("娌℃湁鎵惧埌"+staffJoinLeaveRecord.getStaffNo()+"缂栧彿鐨勫憳宸�,鏃犳硶鏂板绂昏亴!!!");
+ }
+ if (staffJoinLeaveRecord.getDimissionReason()==null){
+ throw new BaseException("绂昏亴鍘熷洜涓嶈兘涓虹┖!!!");
}
}
return staffJoinLeaveRecordMapper.insert(staffJoinLeaveRecord);
@@ -168,6 +170,9 @@
}else {
/*绂昏亴*/
//绂昏亴鐨勭紪杈戜笉浼氬奖鍝嶅湪鑱岃〃
+ if (staffJoinLeaveRecord.getDimissionReason()==null){
+ throw new BaseException("绂昏亴鍘熷洜涓嶈兘涓虹┖!!!");
+ }
}
return staffJoinLeaveRecordMapper.updateById(staffJoinLeaveRecord);
}
--
Gitblit v1.9.3