From c41453da216df0e5c01a9d319544c88446e22b66 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 26 八月 2026 10:51:47 +0800
Subject: [PATCH] fix(approve): 修复审批模板更新时的引用检查逻辑
---
src/main/java/com/ruoyi/approve/service/impl/ApprovalTemplateServiceImpl.java | 17 +++++++++++++++--
src/main/resources/application.yml | 6 +++---
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApprovalTemplateServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApprovalTemplateServiceImpl.java
index 9a5f0b8..fa049f1 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApprovalTemplateServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApprovalTemplateServiceImpl.java
@@ -85,8 +85,8 @@
@Override
public Boolean updateApprovalTemplateDto(ApprovalTemplateDto approvalTemplateDto) {
- // 妫�鏌ユā鏉挎槸鍚﹁瀹℃壒瀹炰緥寮曠敤
- if (isTemplateReferenced(approvalTemplateDto.getId())) {
+ // 妫�鏌ユā鏉挎槸鍚﹁杩涜涓殑瀹℃壒瀹炰緥寮曠敤
+ if (hasPendingReference(approvalTemplateDto.getId())) {
throw new RuntimeException("璇ュ鎵规ā鏉垮凡琚鎵规祦绋嬪紩鐢紝鏃犳硶缂栬緫");
}
approvalTemplateMapper.updateById(approvalTemplateDto);
@@ -305,4 +305,17 @@
);
return count != null && count > 0;
}
+
+ private boolean hasPendingReference(Long templateId) {
+ if (templateId == null) {
+ return false;
+ }
+ Long count = approvalInstanceMapper.selectCount(
+ new LambdaQueryWrapper<ApprovalInstance>()
+ .eq(ApprovalInstance::getTemplateId, templateId)
+ .eq(ApprovalInstance::getDeleted, 0)
+ .eq(ApprovalInstance::getStatus, "PENDING")
+ );
+ return count != null && count > 0;
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ad3d4bc..4ab122c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -28,14 +28,14 @@
api-key: sk-bd235cc13cd74e2388aa8984c84f691f
model-name: "qwen-max"
embedding-model:
- api-key: sk-9748859926b94096b920baaa12c343f5
+ api-key: sk-bd235cc13cd74e2388aa8984c84f691f
model-name: "text-embedding-v3"
chat-model:
- api-key: sk-9748859926b94096b920baaa12c343f5
+ api-key: sk-bd235cc13cd74e2388aa8984c84f691f
model-name: "qwen-max"
open-ai:
chat-model:
- api-key: sk-9748859926b94096b920baaa12c343f5
+ api-key: sk-bd235cc13cd74e2388aa8984c84f691f
base-url: "https://dashscope.aliyuncs.com/compatible-mode/v1"
model-name: "deepseek-v3"
log-requests: true
--
Gitblit v1.9.3