From 5cce09b5c2e520954d85e6e42b9b6f55472dbb59 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 03 二月 2023 00:39:15 +0800
Subject: [PATCH] fix 修复 翻译模块 无法翻译实体属性值为 Null 的字段的问题
---
ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/impl/UserNameTranslationImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/impl/UserNameTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/impl/UserNameTranslationImpl.java
index 3906393..dbb71dc 100644
--- a/ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/impl/UserNameTranslationImpl.java
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/impl/UserNameTranslationImpl.java
@@ -1,28 +1,27 @@
package com.ruoyi.common.translation.core.impl;
+import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.translation.annotation.TranslationType;
import com.ruoyi.common.translation.constant.TransConstant;
import com.ruoyi.common.translation.core.TranslationInterface;
+import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
/**
- * 缈昏瘧鎺ュ彛 (瀹炵幇绫婚渶鏍囨敞 {@link com.ruoyi.common.translation.annotation.TranslationType} 娉ㄨВ鏍囨槑缈昏瘧绫诲瀷)
+ * 鐢ㄦ埛鍚嶇炕璇戝疄鐜�
*
* @author Lion Li
*/
@Component
+@AllArgsConstructor
@TranslationType(type = TransConstant.USER_ID_TO_NAME)
public class UserNameTranslationImpl implements TranslationInterface {
- /**
- * 缈昏瘧
- *
- * @param key 闇�瑕佽缈昏瘧鐨勯敭
- * @return 杩斿洖閿搴旂殑鍊�
- */
- public String translation(Object key) {
+ private final UserService userService;
+
+ public String translation(Object key, String other) {
if (key instanceof Long id) {
- return "admin";
+ return userService.selectUserNameById(id);
}
return null;
}
--
Gitblit v1.9.3