From 3aac40a51e6dcdd449e4ea5d0418ca837de5a2da Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 21 Jul 2025 16:17:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E3=80=90BPM=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E3=80=91=E6=B5=81=E7=A8=8B=E6=A8=A1=E5=9E=8B=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=88=A0=E9=99=A4=E6=97=B6=EF=BC=8C=E9=A2=9D=E5=A4=96?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E8=A2=AB=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=89=80=E4=BD=BF=E7=94=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/bpm/enums/ErrorCodeConstants.java     |  1 +
 .../definition/BpmCategoryServiceImpl.java       | 16 +++++++++++++---
 .../bpm/service/definition/BpmModelService.java  |  8 ++++++++
 .../service/definition/BpmModelServiceImpl.java  |  8 ++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
index d5d6fa77c4..4f7d7bf7ce 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
@@ -74,6 +74,7 @@ public interface ErrorCodeConstants {
     ErrorCode CATEGORY_NOT_EXISTS = new ErrorCode(1_009_012_000, "流程分类不存在");
     ErrorCode CATEGORY_NAME_DUPLICATE = new ErrorCode(1_009_012_001, "流程分类名字【{}】重复");
     ErrorCode CATEGORY_CODE_DUPLICATE = new ErrorCode(1_009_012_002, "流程分类编码【{}】重复");
+    ErrorCode CATEGORY_DELETE_FAIL_MODEL_USED = new ErrorCode(1_009_012_003, "删除失败，流程分类【{}】已被流程模型使用，请先删除对应的流程模型");
 
     // ========== BPM 流程监听器 1-009-013-000 ==========
     ErrorCode PROCESS_LISTENER_NOT_EXISTS = new ErrorCode(1_009_013_000, "流程监听器不存在");
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmCategoryServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmCategoryServiceImpl.java
index 8a48da15a4..42d399acd5 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmCategoryServiceImpl.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmCategoryServiceImpl.java
@@ -34,6 +34,9 @@ public class BpmCategoryServiceImpl implements BpmCategoryService {
     @Resource
     private BpmCategoryMapper bpmCategoryMapper;
 
+    @Resource
+    private BpmModelService modelService;
+
     @Override
     public Long createCategory(BpmCategorySaveReqVO createReqVO) {
         // 校验唯一
@@ -77,15 +80,22 @@ public class BpmCategoryServiceImpl implements BpmCategoryService {
     @Override
     public void deleteCategory(Long id) {
         // 校验存在
-        validateCategoryExists(id);
+        BpmCategoryDO category = validateCategoryExists(id);
+        // 校验是否被流程模型使用
+        Long count = modelService.getModelCountByCategory(category.getCode());
+        if (count > 0) {
+            throw exception(CATEGORY_DELETE_FAIL_MODEL_USED, category.getName());
+        }
         // 删除
         bpmCategoryMapper.deleteById(id);
     }
 
-    private void validateCategoryExists(Long id) {
-        if (bpmCategoryMapper.selectById(id) == null) {
+    private BpmCategoryDO validateCategoryExists(Long id) {
+        BpmCategoryDO category = bpmCategoryMapper.selectById(id);
+        if (category == null) {
             throw exception(CATEGORY_NOT_EXISTS);
         }
+        return category;
     }
 
     @Override
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
index 5601bcda31..3273d24cbe 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
@@ -24,6 +24,14 @@ public interface BpmModelService {
      */
     List<Model> getModelList(String name);
 
+    /**
+     * 根据分类编码获得流程模型数量
+     *
+     * @param category 分类编码
+     * @return 流程模型数量
+     */
+    Long getModelCountByCategory(String category);
+
     /**
      * 创建流程模型
      *
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
index e8e90006f8..c23ea9ce8f 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
@@ -88,6 +88,14 @@ public class BpmModelServiceImpl implements BpmModelService {
         return modelQuery.list();
     }
 
+    @Override
+    public Long getModelCountByCategory(String category) {
+        return repositoryService.createModelQuery()
+                .modelCategory(category)
+                .modelTenantId(FlowableUtils.getTenantId())
+                .count();
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String createModel(@Valid BpmModelSaveReqVO createReqVO) {