From 803c44d7b07636641e422437ebe8b9d20e9de6b8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 29 一月 2026 09:12:24 +0800
Subject: [PATCH] fix: 岗位查询判处处理

---
 src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java |   16 ++++++++++++++--
 1 files changed, 14 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 ff8faa5..53604e0 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;
@@ -30,6 +32,9 @@
     @Autowired
     private StaffOnJobMapper staffOnJobMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     //鏂板绂昏亴鍒楄〃鍒嗛〉鏌ヨ
     @Override
     public IPage<StaffLeaveDto> staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
@@ -54,12 +59,19 @@
         // 鏂板绂昏亴璁板綍
         StaffLeave staffLeave = new StaffLeave();
         staffLeave.setStaffOnJobId(staffLeaveDto.getStaffOnJobId());
+        staffLeave.setReason(staffLeaveDto.getReason());
         String reason = staffLeaveDto.getReason();
-        if (!StaffLeaveReasonOther.getCode().equals(reason)){
-            staffLeave.setRemark("");
+        if (StaffLeaveReasonOther.getCode().equals(reason)){
+            staffLeave.setRemark(staffLeaveDto.getRemark());
         }
         staffLeaveMapper.insert(staffLeave);
 
+        // 鏇存柊瀵瑰簲鐢ㄦ埛鐘舵�佷负鍋滅敤
+        // 鏍规嵁鍛樺伐缂栧彿鏌ヨ鐢ㄦ埛
+        SysUser sysUser = sysUserMapper.selectUserByUserName(staffOnJob.getStaffNo());
+        sysUser.setStatus("1");
+        sysUserMapper.updateUser(sysUser);
+
         // 鏇存柊绂昏亴鐘舵�佷负绂昏亴
         staffOnJob.setStaffState(0);
        return staffOnJobMapper.updateById(staffOnJob);

--
Gitblit v1.9.3