From 2d1e904f3049218474318cb1e2fe5c3a3869cfb0 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 29 一月 2026 16:47:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 ac9792c..8e4ce04 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.staff.dto.StaffLeaveDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
@@ -29,6 +31,9 @@
@Autowired
private StaffOnJobMapper staffOnJobMapper;
+
+ @Autowired
+ private SysUserMapper sysUserMapper;
//鏂板绂昏亴鍒楄〃鍒嗛〉鏌ヨ
@Override
@@ -61,6 +66,14 @@
}
staffLeaveMapper.insert(staffLeave);
+ // 鏇存柊瀵瑰簲鐢ㄦ埛鐘舵�佷负鍋滅敤
+ // 鏍规嵁鍛樺伐缂栧彿鏌ヨ鐢ㄦ埛
+ SysUser sysUser = sysUserMapper.selectUserByUserName(staffOnJob.getStaffNo());
+ if (sysUser != null) {
+ sysUser.setStatus("1");
+ sysUserMapper.updateUser(sysUser);
+ }
+
// 鏇存柊绂昏亴鐘舵�佷负绂昏亴
staffOnJob.setStaffState(0);
return staffOnJobMapper.updateById(staffOnJob);
--
Gitblit v1.9.3