From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力

---
 yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/core/TranslateUtils.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/core/TranslateUtils.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/core/TranslateUtils.java
index 127e7c4..959b587 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/core/TranslateUtils.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/core/TranslateUtils.java
@@ -28,7 +28,11 @@
      * @return 缈昏瘧缁撴灉
      */
     public static <T extends VO> List<T> translate(List<T> data) {
-        if (CollUtil.isNotEmpty((data))) {
+        // transService 鐢� TranslateConfig 鍦� easy-trans 鍙敤鏃舵敞鍏ワ紱
+        // Spring Boot 4 涓� easy-trans 鑷姩閰嶇疆琚鐢紙瑙佸悇 profile 鐨� spring.autoconfigure.exclude锛夛紝
+        // 姝ゆ椂 transService 涓� null銆傜炕璇戝彧鏄寮哄睍绀猴紝缂哄け鏃剁洿鎺ヨ繑鍥炲師鏁版嵁锛�
+        // 涓嶈兘璁╁鍑虹被鎺ュ彛鍥犱负缈昏瘧缁勪欢涓嶅彲鐢ㄨ�屾姏 NPE 鍙樻垚 500銆�
+        if (transService != null && CollUtil.isNotEmpty((data))) {
             transService.transBatch(data);
         }
         return data;

--
Gitblit v1.9.3