From de3504ed5e2db2e5fc6805ec4bab1aed07ad6c3e Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sat, 6 Jul 2024 23:56:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/wrapper/JoinAbstractLambdaWrapper.java | 12 ++++--------
 .../yulichang/wrapper/JoinAbstractWrapper.java       |  9 +++------
 mybatis-plus-join/pom.xml                            |  1 -
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java
index 2a72db2..84406d1 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java
@@ -216,20 +216,16 @@ public abstract class JoinAbstractLambdaWrapper<T, Children extends JoinAbstract
         return decode;
     }
 
-    @Override
-    protected <X> String columnToString(Integer index, String alias, X column, boolean isJoin, PrefixEnum prefixEnum, boolean orderBy) {
-        return columnToString(index, alias, (SFunction<?, ?>) column, isJoin, prefixEnum, orderBy);
-    }
 
     @Override
     @SafeVarargs
-    protected final <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, X... columns) {
-        return Arrays.stream(columns).map(i ->
-                        columnToString(index, alias, (SFunction<?, ?>) i, false, prefixEnum, false))
+    protected final <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, SFunction<X, ?>... columns) {
+        return Arrays.stream(columns).map(i -> columnToString(index, alias, i, false, prefixEnum, false))
                 .collect(joining(StringPool.COMMA));
     }
 
-    protected String columnToString(Integer index, String alias, SFunction<?, ?> column, boolean isJoin, PrefixEnum prefixEnum, boolean orderBy) {
+    @Override
+    protected <X> String columnToString(Integer index, String alias, SFunction<X, ?> column, boolean isJoin, PrefixEnum prefixEnum, boolean orderBy) {
         Class<?> entityClass = LambdaUtils.getEntityClass(column);
         if (orderBy) {
             TableInfo info = TableHelper.get(entityClass);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractWrapper.java
index afd1ae8..74d7804 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractWrapper.java
@@ -881,9 +881,7 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
     /**
      * 获取 columnName
      */
-    protected <X> String columnToString(Integer index, String alias, X column, boolean isJoin, PrefixEnum prefixEnum, boolean orderBy) {
-        return (String) column;
-    }
+    abstract protected <X> String columnToString(Integer index, String alias, SFunction<X, ?> column, boolean isJoin, PrefixEnum prefixEnum, boolean orderBy);
 
     protected String columnToString(String column) {
         if (checkSqlInjection && MPJSqlInjectionUtils.check(column)) {
@@ -906,11 +904,10 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
      *
      * @param columns 多字段
      */
-    abstract <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, X... columns);
+    abstract <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, SFunction<X, ?>... columns);
 
     public <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, boolean orderBy, List<X> columns) {
-        return columns.stream().map(i ->
-                        columnToString(index, alias, (SFunction<?, ?>) i, false, prefixEnum, orderBy))
+        return columns.stream().map(i -> columnToString(index, alias, (SFunction<?, ?>) i, false, prefixEnum, orderBy))
                 .collect(joining(StringPool.COMMA));
     }
 
diff --git a/mybatis-plus-join/pom.xml b/mybatis-plus-join/pom.xml
index b6f4c52..5e88ab6 100644
--- a/mybatis-plus-join/pom.xml
+++ b/mybatis-plus-join/pom.xml
@@ -66,7 +66,6 @@
                 <artifactId>flatten-maven-plugin</artifactId>
                 <version>1.5.0</version>
                 <configuration>
-                    <!-- 是否更新pom文件，此处还有更高级的用法 -->
                     <updatePomFile>true</updatePomFile>
                     <flattenMode>resolveCiFriendliesOnly</flattenMode>
                 </configuration>