From 52bf215b6d441faf13011db012bc901c97ebb3cc Mon Sep 17 00:00:00 2001
From: songgaoshuai <1742057357@qq.com>
Date: Fri, 30 Jun 2023 12:54:05 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/dromara/workflow/domain/bo/ModelBo.java   | 6 ++++++
 .../dromara/workflow/service/impl/ActModelServiceImpl.java  | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java
index b89d78a2c..f8b037a65 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java
@@ -33,6 +33,12 @@ public class ModelBo extends PageEntity implements Serializable {
     @NotBlank(message = "模型标识key不能为空", groups = {AddGroup.class})
     private String key;
 
+    /**
+     * 模型标识key
+     */
+    @NotBlank(message = "模型分类不能为空", groups = {AddGroup.class})
+    private String categoryCode;
+
     /**
      * 备注
      */
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
index fadab4713..b9361cc3e 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
@@ -83,6 +83,9 @@ public class ActModelServiceImpl implements IActModelService {
         if (StringUtils.isNotEmpty(modelBo.getKey())) {
             query.modelKey(modelBo.getKey());
         }
+        if (StringUtils.isNotEmpty(modelBo.getCategoryCode())) {
+            query.modelCategory(modelBo.getCategoryCode());
+        }
         query.orderByLastUpdateTime().desc();
         //创建时间降序排列
         query.orderByCreateTime().desc();
@@ -125,6 +128,7 @@ public class ActModelServiceImpl implements IActModelService {
             Model model = repositoryService.newModel();
             model.setKey(key);
             model.setName(name);
+            model.setCategory(modelBo.getCategoryCode());
             model.setVersion(version);
             model.setTenantId(TenantHelper.getTenantId());
             ObjectMapper objectMapper = JsonUtils.getObjectMapper();