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-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/cancellation/CrmCancellationMapper.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/cancellation/CrmCancellationMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/cancellation/CrmCancellationMapper.java
index 1b7b536..a6acc44 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/cancellation/CrmCancellationMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/cancellation/CrmCancellationMapper.java
@@ -5,6 +5,7 @@
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.crm.controller.admin.cancellation.vo.CrmCancellationPageReqVO;
 import cn.iocoder.yudao.module.crm.dal.dataobject.cancellation.CrmCancellationDO;
+import cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -31,6 +32,8 @@
     default int submitAndResetAuditInfo(Long id, Integer status) {
         return update(null, new LambdaUpdateWrapper<CrmCancellationDO>()
                 .eq(CrmCancellationDO::getId, id)
+                .in(CrmCancellationDO::getAuditStatus, CrmAuditStatusEnum.DRAFT.getStatus(),
+                        CrmAuditStatusEnum.REJECT.getStatus())
                 .set(CrmCancellationDO::getAuditStatus, status)
                 .set(CrmCancellationDO::getReviewerId, null)
                 .set(CrmCancellationDO::getReviewerName, null)
@@ -54,6 +57,7 @@
                                   String reviewerName, String reviewRemark) {
         return update(null, new LambdaUpdateWrapper<CrmCancellationDO>()
                 .eq(CrmCancellationDO::getId, id)
+                .eq(CrmCancellationDO::getAuditStatus, CrmAuditStatusEnum.PROCESS.getStatus())
                 .set(CrmCancellationDO::getAuditStatus, status)
                 .set(CrmCancellationDO::getReviewerId, reviewerId)
                 .set(CrmCancellationDO::getReviewerName, reviewerName)

--
Gitblit v1.9.3