From ffe8b16ff3f793cba1e05daf66ec6df47cf93a4f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 24 一月 2025 12:17:36 +0800
Subject: [PATCH] fix 修复 翻译报错问题
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java | 8 ++++++--
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java | 4 ++--
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java | 2 +-
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 478e93a..91f173d 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 @@
* @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 f13e666..8c73b59 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 @@
@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 053d249..db1b7b7 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 @@
*/
@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<FlowCategory>()
--
Gitblit v1.9.3