From 234f74f8f009a9f164639666d8f3e654f1845b7c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 04 二月 2023 11:47:11 +0800
Subject: [PATCH] add 新增 翻译模块 部门名称翻译 update 优化 部门业务增加缓存逻辑

---
 ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/handler/TranslationHandler.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/handler/TranslationHandler.java b/ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/handler/TranslationHandler.java
index 0a8f1b3..69a2e45 100644
--- a/ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/handler/TranslationHandler.java
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/com/ruoyi/common/translation/core/handler/TranslationHandler.java
@@ -41,10 +41,15 @@
             if (StringUtils.isNotBlank(translation.mapper())) {
                 value = ReflectUtils.invokeGetter(gen.getCurrentValue(), translation.mapper());
             }
+            // 濡傛灉涓� null 鐩存帴鍐欏嚭
+            if (ObjectUtil.isNull(value)) {
+                gen.writeNull();
+                return;
+            }
             String result = trans.translation(value, translation.other());
-            gen.writeString(StringUtils.isNotBlank(result) ? result : value.toString());
+            gen.writeString(result);
         } else {
-            gen.writeString(value.toString());
+            gen.writeObject(value);
         }
     }
 

--
Gitblit v1.9.3