From ffe8b16ff3f793cba1e05daf66ec6df47cf93a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 24 Jan 2025 12:17:36 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/workflow/service/IFlwCategoryService.java | 2 +- .../service/impl/CategoryNameTranslationImpl.java | 8 ++++++-- .../workflow/service/impl/FlwCategoryServiceImpl.java | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java index 478e93ab6..91f173d4f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java @@ -27,7 +27,7 @@ public interface IFlwCategoryService { * @param categoryId 流程分类ID * @return 流程分类名称 */ - String selectCategoryNameById(String categoryId); + String selectCategoryNameById(Long categoryId); /** * 查询符合条件的流程分类列表 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java index f13e66645..8c73b59ee 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java @@ -1,5 +1,6 @@ package org.dromara.workflow.service.impl; +import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.translation.annotation.TranslationType; @@ -25,9 +26,12 @@ public class CategoryNameTranslationImpl implements TranslationInterface @Override public String translation(Object key, String other) { + Long id = null; if (key instanceof String categoryId) { - return flwCategoryService.selectCategoryNameById(categoryId); + id = Convert.toLong(categoryId); + } else if (key instanceof Long categoryId) { + id = categoryId; } - return null; + return flwCategoryService.selectCategoryNameById(id); } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java index 053d2492b..db1b7b7f0 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java @@ -66,8 +66,8 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService { */ @Cacheable(cacheNames = FlowConstant.FLOW_CATEGORY_NAME, key = "#categoryId") @Override - public String selectCategoryNameById(String categoryId) { - if (StringUtils.isBlank(categoryId)) { + public String selectCategoryNameById(Long categoryId) { + if (ObjectUtil.isNull(categoryId)) { return null; } FlowCategory category = baseMapper.selectOne(new LambdaQueryWrapper()