From 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 15:43:33 +0800
Subject: [PATCH] fix: 完善审批流程与业务状态校验
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java
index 47ffce1..17ba3a7 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmLeaveApplicationServiceImpl.java
@@ -77,7 +77,7 @@
}
AdminUserRespDTO user = adminUserApi.getUser(userId);
if (user == null) {
- userId = getCurrentUserId();
+ throw exception(LEAVE_APPLICATION_APPLICANT_NOT_EXISTS);
}
// 3. 鎻掑叆
HrmLeaveApplicationDO application = BeanUtils.toBean(createReqVO, HrmLeaveApplicationDO.class);
@@ -108,9 +108,9 @@
public void updateLeaveApplication(HrmLeaveApplicationSaveReqVO updateReqVO) {
// 鏍￠獙瀛樺湪
HrmLeaveApplicationDO application = validateLeaveApplicationExists(updateReqVO.getId());
- // 鏍￠獙鐘舵�佷负鑽夌鎴栧鎵逛腑
+ // 鏍￠獙鐘舵�佷负鑽夌鎴栧鏍镐笉閫氳繃锛堝鎵逛腑绂佹淇敼锛�
if (!Objects.equals(application.getStatus(), HrmAuditStatusEnum.DRAFT.getStatus())
- && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.PROCESS.getStatus())) {
+ && !Objects.equals(application.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())) {
throw exception(LEAVE_APPLICATION_UPDATE_FAIL_NOT_DRAFT);
}
// 鏇存柊
@@ -222,7 +222,9 @@
approvalConfigApi.validateApprovalEnabledAndGetApprovers(LEAVE_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋滐紝閬垮厤娈嬬暀銆屽鏍镐笉閫氳繃銆嶇殑鍘熷洜
- leaveApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus());
+ if (leaveApplicationMapper.submitAndResetAuditInfo(id, HrmAuditStatusEnum.PROCESS.getStatus()) != 1) {
+ throw exception(LEAVE_APPLICATION_SUBMIT_FAIL_NOT_EDITABLE);
+ }
}
@Override
@@ -247,13 +249,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(LEAVE_APPLICATION_AUDIT_REJECT_REASON_REQUIRED);
}
- leaveApplicationMapper.auditLeaveApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (leaveApplicationMapper.auditLeaveApplication(id, HrmAuditStatusEnum.REJECT.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(LEAVE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄鏍搁�氳繃
- leaveApplicationMapper.auditLeaveApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (leaveApplicationMapper.auditLeaveApplication(id, HrmAuditStatusEnum.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(LEAVE_APPLICATION_AUDIT_FAIL_NOT_PROCESS);
+ }
}
/**
--
Gitblit v1.9.3