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/dal/mysql/approval/HrmResignationApplicationMapper.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java
index 80a6ce0..e3e9117 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/mysql/approval/HrmResignationApplicationMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.hrm.controller.admin.approval.vo.HrmResignationApplicationPageReqVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.approval.HrmResignationApplicationDO;
+import cn.iocoder.yudao.module.hrm.enums.HrmAuditStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -46,6 +47,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<HrmResignationApplicationDO>()
.eq(HrmResignationApplicationDO::getId, id)
+ .in(HrmResignationApplicationDO::getStatus,
+ HrmAuditStatusEnum.DRAFT.getStatus(), HrmAuditStatusEnum.REJECT.getStatus())
.set(HrmResignationApplicationDO::getStatus, status)
.set(HrmResignationApplicationDO::getReviewerId, null)
.set(HrmResignationApplicationDO::getReviewerName, null)
@@ -69,6 +72,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<HrmResignationApplicationDO>()
.eq(HrmResignationApplicationDO::getId, id)
+ .eq(HrmResignationApplicationDO::getStatus, HrmAuditStatusEnum.PROCESS.getStatus())
.set(HrmResignationApplicationDO::getStatus, status)
.set(HrmResignationApplicationDO::getReviewerId, reviewerId)
.set(HrmResignationApplicationDO::getReviewerName, reviewerName)
--
Gitblit v1.9.3