From 6d5f8d5dd6f337837c7a0007639490afe3c7409c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 12 三月 2026 13:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
index 53604e0..a3da111 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
@@ -69,8 +69,10 @@
// 鏇存柊瀵瑰簲鐢ㄦ埛鐘舵�佷负鍋滅敤
// 鏍规嵁鍛樺伐缂栧彿鏌ヨ鐢ㄦ埛
SysUser sysUser = sysUserMapper.selectUserByUserName(staffOnJob.getStaffNo());
- sysUser.setStatus("1");
- sysUserMapper.updateUser(sysUser);
+ if (sysUser != null) {
+ sysUser.setStatus("1");
+ sysUserMapper.updateUser(sysUser);
+ }
// 鏇存柊绂昏亴鐘舵�佷负绂昏亴
staffOnJob.setStaffState(0);
@@ -88,6 +90,7 @@
String reason = staffLeaveDto.getReason();
leave.setReason(reason);
+ leave.setLeaveDate(staffLeaveDto.getLeaveDate());
// 鏍￠獙绂昏亴鍘熷洜鏄惁涓哄叾浠栵紝濡傛灉鏄叾浠栵紝澶囨敞璧嬪��
if (StaffLeaveReasonOther.getCode().equals(reason)){
leave.setRemark(staffLeaveDto.getRemark());
--
Gitblit v1.9.3