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-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
index 397afd9..016787d 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
@@ -177,7 +177,9 @@
// 2. 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鎵逛汉
approvalConfigApi.validateApprovalEnabledAndGetApprovers(FINANCE_PAYMENT_APPROVE_BIZ_TYPE);
// 3. 鐘舵�佺疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
- financePaymentMapper.submitAndResetAuditInfo(id, ErpAuditStatus.APPROVING.getStatus());
+ if (financePaymentMapper.submitAndResetAuditInfo(id, ErpAuditStatus.APPROVING.getStatus()) != 1) {
+ throw exception(FINANCE_PAYMENT_SUBMIT_FAIL_NOT_ALLOWED);
+ }
}
@Override
@@ -202,13 +204,17 @@
if (StrUtil.isBlank(reviewRemark)) {
throw exception(FINANCE_PAYMENT_AUDIT_REJECT_REASON_REQUIRED);
}
- financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.PROCESS.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.PROCESS.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(FINANCE_PAYMENT_AUDIT_FAIL_NOT_PROCESS);
+ }
return;
}
// 5. 瀹℃牳閫氳繃锛氳褰曞鏍镐汉涓庡鏍告剰瑙侊紝鐘舵�佺疆涓哄凡瀹℃牳
- financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.APPROVE.getStatus(),
- userId, getUserNickname(userId), reviewRemark);
+ if (financePaymentMapper.auditFinancePayment(id, ErpAuditStatus.APPROVE.getStatus(),
+ userId, getUserNickname(userId), reviewRemark) != 1) {
+ throw exception(FINANCE_PAYMENT_AUDIT_FAIL_NOT_PROCESS);
+ }
}
/**
--
Gitblit v1.9.3