From a0914318549b357ef3c438d0c2a3714f58ea3487 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 23 一月 2026 14:14:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java | 5 +++--
1 files changed, 3 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..ac9792c 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java
@@ -54,9 +54,10 @@
// 鏂板绂昏亴璁板綍
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);
--
Gitblit v1.9.3