From 934bbe8bd7d56aad0356880a8cf1dfe3aee817e7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 07 二月 2025 14:15:54 +0800
Subject: [PATCH] update springboot 3.4.1 => 3.4.2 update springdoc 2.8.3 => 2.8.4 update satoken 1.39.0 => 1.40.0 update redisson 3.43.0 => 3.44.0
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
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 4adbada..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,9 +1,11 @@
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;
import org.dromara.common.translation.core.TranslationInterface;
+import org.dromara.workflow.common.ConditionalOnEnable;
import org.dromara.workflow.common.constant.FlowConstant;
import org.dromara.workflow.service.IFlwCategoryService;
import org.springframework.stereotype.Service;
@@ -13,6 +15,7 @@
*
* @author AprilWind
*/
+@ConditionalOnEnable
@Slf4j
@RequiredArgsConstructor
@Service
@@ -23,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);
}
}
--
Gitblit v1.9.3