From 4de45ce1709ff2a5c033621edd8e0e397558cd1c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 15 八月 2024 19:52:03 +0800
Subject: [PATCH] update 优化 兼容部分用户不想给用户分配角色与部门的场景
---
ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java
index ac65f5a..b92c7f0 100644
--- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java
@@ -20,7 +20,9 @@
@Override
public String translation(Object key, String other) {
if (key instanceof Long id) {
- return userService.selectNicknameById(id);
+ return userService.selectNicknameByIds(id.toString());
+ } else if (key instanceof String ids) {
+ return userService.selectNicknameByIds(ids);
}
return null;
}
--
Gitblit v1.9.3