From 9ed4cf1bfcab872af458f0af6d64422f258b90f5 Mon Sep 17 00:00:00 2001
From: Du YinHong <1836695061@qq.com>
Date: Mon, 24 Aug 2026 14:56:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=89=94=E9=99=A4=E8=BD=AC=E6=8D=A2=E5=99=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=202.groupBy=E7=9B=B4=E6=8E=A5=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8MPJ=E8=87=AA=E5=8A=A8=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/query/LambdaJoinQueryBuilder.java        | 15 ++++++---------
 .../core/impl/DictTypeTranslationImpl.java        |  4 ++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaJoinQueryBuilder.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaJoinQueryBuilder.java
index d3a082077..9a04aff4a 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaJoinQueryBuilder.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/query/LambdaJoinQueryBuilder.java
@@ -75,16 +75,13 @@ public final class LambdaJoinQueryBuilder<T> {
             return this;
         }
         for (SFunction<E, ?> column : columns) {
-            // 无别名时，解析字段所属实体表名作为默认前缀，避免同名列歧义
-            String effectiveAlias = alias;
-            if (StringUtils.isBlank(effectiveAlias)) {
-                Class<?> entityClass = LambdaUtils.getEntityClass(column);
-                TableInfo tableInfo = TableInfoHelper.getTableInfo(entityClass);
-                if (tableInfo != null) {
-                    effectiveAlias = tableInfo.getTableName();
-                }
+            if (StringUtils.isNotBlank(alias)) {
+                // 使用 MPJ 的别名重载
+                wrapper.groupBy(alias, column);
+            } else {
+                // 无别名：交给 MPJ 自动解析
+                wrapper.groupBy(column);
             }
-            wrapper.groupBy(qualifiedColumn(effectiveAlias, column));
         }
         return this;
     }
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java
index 5312f1d92..96b0801e8 100644
--- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java
@@ -34,7 +34,7 @@ public class DictTypeTranslationImpl implements TranslationInterface<String> {
      */
     @Override
     public String translation(Object key, String other) {
-        if (Convert.toStr(key) instanceof String dictValue && StringUtils.isNotBlank(other)) {
+        if (key instanceof String dictValue && StringUtils.isNotBlank(other)) {
             return dictService.getDictLabel(other, dictValue);
         }
         return null;
@@ -55,7 +55,7 @@ public class DictTypeTranslationImpl implements TranslationInterface<String> {
         Map<String, String> dictMap = dictService.getAllDictByDictType(other);
         Map<Object, String> result = new LinkedHashMap<>(keys.size());
         for (Object key : keys) {
-            if (Convert.toStr(key) instanceof String dictValue) {
+            if (key instanceof String dictValue) {
                 result.put(key, StreamUtils.join(
                     StreamUtils.filter(Arrays.asList(dictValue.split(",")), StringUtils::isNotBlank),
                     value -> dictMap.get(value.trim())