From 125bfdb19c7c1b2dce568cac52afd9ab5a312f22 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Thu, 30 Nov 2023 10:37:29 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=B0=83=E6=95=B4=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=88=86=E7=B1=BB=E5=90=8D=E7=A7=B0=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/axzo/workflow/core/service/CategoryService.java | 1 +
 .../workflow/core/service/impl/CategoryServiceImpl.java     | 6 ++++++
 .../listener/notice/RocketMqMessagePushEventListener.java   | 3 +--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/CategoryService.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/CategoryService.java
index 469b3065b..3c0851131 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/CategoryService.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/CategoryService.java
@@ -13,6 +13,7 @@ import java.util.Optional;
 
 public interface CategoryService {
 
+    Optional<CategoryItemVO> getById(Long id);
     /**
      * 获取指定分类
      *
diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/CategoryServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/CategoryServiceImpl.java
index 223f6a3d9..2e42c9612 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/CategoryServiceImpl.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/CategoryServiceImpl.java
@@ -38,6 +38,12 @@ public class CategoryServiceImpl extends ServiceImpl<ExtAxDictMapper, ExtAxDict>
 
     private final CategoryConverter categoryConverter;
 
+    @Override
+    public Optional<CategoryItemVO> getById(Long id) {
+        ExtAxDict extAxDict = dictMapper.selectById(id);
+        return Optional.ofNullable(categoryConverter.toVo(extAxDict));
+    }
+
     @Override
     public Optional<CategoryItemVO> get(String type, String value) {
         List<ExtAxDict> list = this.lambdaQuery().eq(ExtAxDict::getType, type)
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
index cc5d2b78e..8622dddd0 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
@@ -31,7 +31,6 @@ import java.util.Map;
 import java.util.Objects;
 
 import static cn.axzo.workflow.common.constant.BpmnConstants.BIZ_ORG_RELATION;
-import static cn.axzo.workflow.common.constant.BpmnConstants.BPM_MODEL_CATEGORY;
 import static cn.axzo.workflow.common.constant.BpmnConstants.COUNTERSIGN_ORIGIN_ASSIGNER;
 import static cn.axzo.workflow.common.constant.BpmnConstants.COUNTERSIGN_REMAIN_ASSIGNER_LIST;
 import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_DELETE_PROCESS_FLAG;
@@ -177,7 +176,7 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis
         variables.put(VAR_TASK_START_TIME, sdf.format(tasks.get(0).getCreateTime()));
         // TODO 操作类型 同意、驳回、加签、评论、转交等
         variables.put(VAR_OPERATOR_TYPE, "");
-        categoryService.get(BPM_MODEL_CATEGORY, processInstance.getCategory()).ifPresent(category -> {
+        categoryService.getById(Long.valueOf(processInstance.getCategory())).ifPresent(category -> {
             variables.put(VAR_BUSINESS_NAME, category.getLabel());
         });