From 1fe9ffb80c5a1032e06ed3d3cd772c77726ea014 Mon Sep 17 00:00:00 2001
From: admin <570810310@qq.com>
Date: Tue, 2 Feb 2021 11:17:07 +0800
Subject: [PATCH] update

---
 .../interceptor/MyResultInterceptor.java      | 37 ++++++++++-------
 ...mbda.java => MyAbstractLambdaWrapper.java} |  2 +-
 .../mybatisplus/query/MyAbstractWrapper.java  | 11 ++++-
 ...daQuery.java => MyLambdaQueryWrapper.java} | 40 ++++++++-----------
 .../{MyQuery.java => MyQueryWrapper.java}     | 30 +++++++-------
 ...per.java => MyJoinLambdaQueryWrapper.java} | 36 +++++++++--------
 6 files changed, 83 insertions(+), 73 deletions(-)
 rename src/main/java/com/github/mybatisplus/query/{MyAbstractLambda.java => MyAbstractLambdaWrapper.java} (97%)
 rename src/main/java/com/github/mybatisplus/query/{MyLambdaQuery.java => MyLambdaQueryWrapper.java} (81%)
 rename src/main/java/com/github/mybatisplus/query/{MyQuery.java => MyQueryWrapper.java} (70%)
 rename src/main/java/com/github/mybatisplus/wrapper/{MyLambdaQueryWrapper.java => MyJoinLambdaQueryWrapper.java} (82%)

diff --git a/src/main/java/com/github/mybatisplus/interceptor/MyResultInterceptor.java b/src/main/java/com/github/mybatisplus/interceptor/MyResultInterceptor.java
index b910368..a42d855 100644
--- a/src/main/java/com/github/mybatisplus/interceptor/MyResultInterceptor.java
+++ b/src/main/java/com/github/mybatisplus/interceptor/MyResultInterceptor.java
@@ -24,6 +24,16 @@ import java.util.Objects;
 @Intercepts({@Signature(type = ResultSetHandler.class, method = "handleResultSets", args = {Statement.class})})
 public class MyResultInterceptor implements Interceptor {
 
+    private static Field parameterHandler = null;
+
+    static {
+        try {
+            parameterHandler = DefaultResultSetHandler.class.getDeclaredField("parameterHandler");
+            parameterHandler.setAccessible(true);
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+    }
 
     @Override
     public Object intercept(Invocation invocation) throws Throwable {
@@ -66,23 +76,20 @@ public class MyResultInterceptor implements Interceptor {
      * @see MybatisParameterHandler
      */
     public static Class<?> getFieldVal(DefaultResultSetHandler handler) {
-        Field[] fieldList = handler.getClass().getDeclaredFields();
-        for (Field f : fieldList) {
-            if (f.getName().equals("parameterHandler")) {
-                f.setAccessible(true);
-                try {
-                    MybatisParameterHandler mybatisParameterHandler = (MybatisParameterHandler) f.get(handler);
-                    Object object = mybatisParameterHandler.getParameterObject();
-                    if (object instanceof Map) {
-                        Map<?, ?> args = (Map<?, ?>) object;
-                        return (Class<?>) args.get(Constant.CLAZZ);
-                    }
-                } catch (Exception e) {
-                    return null;
-                }
+        try {
+            MybatisParameterHandler mybatisParameterHandler = (MybatisParameterHandler) parameterHandler.get(handler);
+            Object object = mybatisParameterHandler.getParameterObject();
+            if (Objects.isNull(object)) {
+                return null;
             }
+            if (object instanceof Map) {
+                Map<?, ?> args = (Map<?, ?>) object;
+                return (Class<?>) args.get(Constant.CLAZZ);
+            }
+            return null;
+        } catch (IllegalAccessException e) {
+            return null;
         }
-        return null;
     }
 
     @Override
diff --git a/src/main/java/com/github/mybatisplus/query/MyAbstractLambda.java b/src/main/java/com/github/mybatisplus/query/MyAbstractLambdaWrapper.java
similarity index 97%
rename from src/main/java/com/github/mybatisplus/query/MyAbstractLambda.java
rename to src/main/java/com/github/mybatisplus/query/MyAbstractLambdaWrapper.java
index a9ccf50..8ce6ed2 100644
--- a/src/main/java/com/github/mybatisplus/query/MyAbstractLambda.java
+++ b/src/main/java/com/github/mybatisplus/query/MyAbstractLambdaWrapper.java
@@ -18,7 +18,7 @@ import static java.util.stream.Collectors.joining;
  * copy {@link com.baomidou.mybatisplus.core.conditions.AbstractLambdaWrapper}
  */
 @SuppressWarnings("serial")
-public abstract class MyAbstractLambda<T, Children extends MyAbstractLambda<T, Children>>
+public abstract class MyAbstractLambdaWrapper<T, Children extends MyAbstractLambdaWrapper<T, Children>>
         extends MyAbstractWrapper<T, SFunction<T, ?>, Children> {
 
     private Map<String, ColumnCache> columnMap = null;
diff --git a/src/main/java/com/github/mybatisplus/query/MyAbstractWrapper.java b/src/main/java/com/github/mybatisplus/query/MyAbstractWrapper.java
index e01e329..8637d42 100644
--- a/src/main/java/com/github/mybatisplus/query/MyAbstractWrapper.java
+++ b/src/main/java/com/github/mybatisplus/query/MyAbstractWrapper.java
@@ -35,7 +35,8 @@ import static java.util.stream.Collectors.joining;
  */
 @SuppressWarnings({"serial", "unchecked"})
 public abstract class MyAbstractWrapper<T, R, Children extends MyAbstractWrapper<T, R, Children>> extends MyWrapper<T>
-        implements Compare<Children, R>, Nested<Children, Children>, Join<Children>, Func<Children, R> {
+        implements Compare<Children, R>, Nested<Children, Children>, Join<Children>, Func<Children, R>,
+        MyJoin<Children> {
 
     /**
      * 占位符
@@ -516,4 +517,12 @@ public abstract class MyAbstractWrapper<T, R, Children extends MyAbstractWrapper
     public Children clone() {
         return SerializationUtils.clone(typedThis);
     }
+
+    @Override
+    public Children join(String keyWord, boolean condition, String joinSql) {
+        if (condition) {
+            from.setStringValue(from.getStringValue() + keyWord + joinSql);
+        }
+        return typedThis;
+    }
 }
diff --git a/src/main/java/com/github/mybatisplus/query/MyLambdaQuery.java b/src/main/java/com/github/mybatisplus/query/MyLambdaQueryWrapper.java
similarity index 81%
rename from src/main/java/com/github/mybatisplus/query/MyLambdaQuery.java
rename to src/main/java/com/github/mybatisplus/query/MyLambdaQueryWrapper.java
index fab6237..6b6e283 100644
--- a/src/main/java/com/github/mybatisplus/query/MyLambdaQuery.java
+++ b/src/main/java/com/github/mybatisplus/query/MyLambdaQueryWrapper.java
@@ -28,8 +28,8 @@ import java.util.stream.Collectors;
  * sqlSelect 由覆盖改为追加
  */
 @SuppressWarnings("serial")
-public class MyLambdaQuery<T> extends MyAbstractLambda<T, MyLambdaQuery<T>>
-        implements Query<MyLambdaQuery<T>, T, SFunction<T, ?>>, MyJoin<MyLambdaQuery<T>> {
+public class MyLambdaQueryWrapper<T> extends MyAbstractLambdaWrapper<T, MyLambdaQueryWrapper<T>>
+        implements Query<MyLambdaQueryWrapper<T>, T, SFunction<T, ?>>, MyJoin<MyLambdaQueryWrapper<T>> {
 
     /**
      * 查询字段
@@ -45,14 +45,14 @@ public class MyLambdaQuery<T> extends MyAbstractLambda<T, MyLambdaQuery<T>>
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(entity)
      */
-    public MyLambdaQuery() {
+    public MyLambdaQueryWrapper() {
         this((T) null);
     }
 
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(entity)
      */
-    public MyLambdaQuery(T entity) {
+    public MyLambdaQueryWrapper(T entity) {
         super.setEntity(entity);
         super.initNeed();
     }
@@ -60,7 +60,7 @@ public class MyLambdaQuery<T> extends MyAbstractLambda<T, MyLambdaQuery<T>>
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(entity)
      */
-    public MyLambdaQuery(Class<T> entityClass) {
+    public MyLambdaQueryWrapper(Class<T> entityClass) {
         super.setEntityClass(entityClass);
         super.initNeed();
     }
@@ -68,9 +68,9 @@ public class MyLambdaQuery<T> extends MyAbstractLambda<T, MyLambdaQuery<T>>
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(...)
      */
-    MyLambdaQuery(T entity, Class<T> entityClass, SharedString from, SharedString sqlSelect, AtomicInteger paramNameSeq,
-                  Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
-                  SharedString lastSql, SharedString sqlComment, SharedString sqlFirst) {
+    MyLambdaQueryWrapper(T entity, Class<T> entityClass, SharedString from, SharedString sqlSelect, AtomicInteger paramNameSeq,
+                         Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
+                         SharedString lastSql, SharedString sqlComment, SharedString sqlFirst) {
         super.setEntity(entity);
         super.setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -90,7 +90,7 @@ public class MyLambdaQuery<T> extends MyAbstractLambda<T, MyLambdaQuery<T>>
      */
     @SafeVarargs
     @Override
-    public final MyLambdaQuery<T> select(SFunction<T, ?>... columns) {
+    public final MyLambdaQueryWrapper<T> select(SFunction<T, ?>... columns) {
         if (ArrayUtils.isNotEmpty(columns)) {
             String s = columnsToString(false, columns);
             if (StringUtils.isBlank(sqlSelect.getStringValue())) {
@@ -103,7 +103,7 @@ public class MyLambdaQuery<T> extends MyAbstractLambda<T, MyLambdaQuery<T>>
     }
 
     @SafeVarargs
-    public final MyLambdaQuery<T> select(String... columns) {
+    public final MyLambdaQueryWrapper<T> select(String... columns) {
         if (ArrayUtils.isNotEmpty(columns)) {
             String s = String.join(StringPool.COMMA, columns);
             if (StringUtils.isBlank(sqlSelect.getStringValue())) {
@@ -127,7 +127,7 @@ public class MyLambdaQuery<T> extends MyAbstractLambda<T, MyLambdaQuery<T>>
      * @return this
      */
     @Override
-    public MyLambdaQuery<T> select(Class<T> entityClass, Predicate<TableFieldInfo> predicate) {
+    public MyLambdaQueryWrapper<T> select(Class<T> entityClass, Predicate<TableFieldInfo> predicate) {
         if (entityClass == null) {
             entityClass = getEntityClass();
         } else {
@@ -145,7 +145,7 @@ public class MyLambdaQuery<T> extends MyAbstractLambda<T, MyLambdaQuery<T>>
         return typedThis;
     }
 
-    public final MyLambdaQuery<T> selectAll(Class<T> clazz) {
+    public final MyLambdaQueryWrapper<T> selectAll(Class<T> clazz) {
         TableInfo info = TableInfoHelper.getTableInfo(clazz);
         List<String> list = new ArrayList<>();
         list.add(Constant.TABLE_ALIAS + StringPool.DOT + info.getKeyColumn());
@@ -162,8 +162,8 @@ public class MyLambdaQuery<T> extends MyAbstractLambda<T, MyLambdaQuery<T>>
     /**
      * 返回一个支持 lambda 函数写法的 wrapper
      */
-    public MyQuery<T> stringQuery() {
-        return new MyQuery<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs,
+    public MyQueryWrapper<T> stringQuery() {
+        return new MyQueryWrapper<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs,
                 expression, sqlSelect, from, lastSql, sqlComment, sqlFirst);
     }
 
@@ -186,8 +186,8 @@ public class MyLambdaQuery<T> extends MyAbstractLambda<T, MyLambdaQuery<T>>
      * <p>故 sqlSelect from不向下传递</p>
      */
     @Override
-    protected MyLambdaQuery<T> instance() {
-        return new MyLambdaQuery<>(getEntity(), getEntityClass(), null, null, paramNameSeq, paramNameValuePairs,
+    protected MyLambdaQueryWrapper<T> instance() {
+        return new MyLambdaQueryWrapper<>(getEntity(), getEntityClass(), null, null, paramNameSeq, paramNameValuePairs,
                 new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString());
     }
 
@@ -197,12 +197,4 @@ public class MyLambdaQuery<T> extends MyAbstractLambda<T, MyLambdaQuery<T>>
         sqlSelect.toNull();
     }
 
-    @Override
-    public MyLambdaQuery<T> join(String keyWord, boolean condition, String joinSql) {
-        if (condition) {
-            from.setStringValue(from.getStringValue() + keyWord + joinSql);
-        }
-        return typedThis;
-    }
-
 }
diff --git a/src/main/java/com/github/mybatisplus/query/MyQuery.java b/src/main/java/com/github/mybatisplus/query/MyQueryWrapper.java
similarity index 70%
rename from src/main/java/com/github/mybatisplus/query/MyQuery.java
rename to src/main/java/com/github/mybatisplus/query/MyQueryWrapper.java
index 93ecf2a..6f8beb3 100644
--- a/src/main/java/com/github/mybatisplus/query/MyQuery.java
+++ b/src/main/java/com/github/mybatisplus/query/MyQueryWrapper.java
@@ -17,8 +17,8 @@ import java.util.function.Predicate;
  * copy {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
  */
 @SuppressWarnings("serial")
-public class MyQuery<T> extends MyAbstractWrapper<T, String, MyQuery<T>>
-        implements Query<MyQuery<T>, T, String> {
+public class MyQueryWrapper<T> extends MyAbstractWrapper<T, String, MyQueryWrapper<T>>
+        implements Query<MyQueryWrapper<T>, T, String> {
 
     /**
      * 查询字段
@@ -30,16 +30,16 @@ public class MyQuery<T> extends MyAbstractWrapper<T, String, MyQuery<T>>
      */
     private SharedString alias = new SharedString(Constant.TABLE_ALIAS);
 
-    public MyQuery() {
+    public MyQueryWrapper() {
         this(null);
     }
 
-    public MyQuery(T entity) {
+    public MyQueryWrapper(T entity) {
         super.setEntity(entity);
         super.initNeed();
     }
 
-    public MyQuery(T entity, String... columns) {
+    public MyQueryWrapper(T entity, String... columns) {
         super.setEntity(entity);
         super.initNeed();
         this.select(columns);
@@ -50,9 +50,9 @@ public class MyQuery<T> extends MyAbstractWrapper<T, String, MyQuery<T>>
      *
      * @param entityClass 本不应该需要的
      */
-    public MyQuery(T entity, Class<T> entityClass, AtomicInteger paramNameSeq,
-                   Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
-                   SharedString sqlSelect, SharedString from, SharedString lastSql, SharedString sqlComment, SharedString sqlFirst) {
+    public MyQueryWrapper(T entity, Class<T> entityClass, AtomicInteger paramNameSeq,
+                          Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
+                          SharedString sqlSelect, SharedString from, SharedString lastSql, SharedString sqlComment, SharedString sqlFirst) {
         super.setEntity(entity);
         super.setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -66,7 +66,7 @@ public class MyQuery<T> extends MyAbstractWrapper<T, String, MyQuery<T>>
     }
 
     @Override
-    public MyQuery<T> select(String... columns) {
+    public MyQueryWrapper<T> select(String... columns) {
         if (ArrayUtils.isNotEmpty(columns)) {
             this.sqlSelect.setStringValue(String.join(StringPool.COMMA, columns));
         }
@@ -74,7 +74,7 @@ public class MyQuery<T> extends MyAbstractWrapper<T, String, MyQuery<T>>
     }
 
     @Override
-    public MyQuery<T> select(Class<T> entityClass, Predicate<TableFieldInfo> predicate) {
+    public MyQueryWrapper<T> select(Class<T> entityClass, Predicate<TableFieldInfo> predicate) {
         super.setEntityClass(entityClass);
         this.sqlSelect.setStringValue(TableInfoHelper.getTableInfo(getEntityClass()).chooseSelect(predicate));
         return typedThis;
@@ -97,9 +97,9 @@ public class MyQuery<T> extends MyAbstractWrapper<T, String, MyQuery<T>>
     /**
      * 返回一个支持 lambda 函数写法的 wrapper
      */
-    public MyLambdaQuery<T> lambda() {
-        return new MyLambdaQuery<>(getEntity(), getEntityClass(), null, null, paramNameSeq, paramNameValuePairs,
-                expression, lastSql, sqlComment, sqlFirst);
+    public MyLambdaQueryWrapper<T> lambda() {
+        return new MyLambdaQueryWrapper<>(getEntity(), getEntityClass(), from, sqlSelect, paramNameSeq, paramNameValuePairs,
+                 expression, lastSql, sqlComment, sqlFirst);
     }
 
     /**
@@ -109,8 +109,8 @@ public class MyQuery<T> extends MyAbstractWrapper<T, String, MyQuery<T>>
      * </p>
      */
     @Override
-    protected MyQuery<T> instance() {
-        return new MyQuery<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs, new MergeSegments(),
+    protected MyQueryWrapper<T> instance() {
+        return new MyQueryWrapper<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs, new MergeSegments(),
                 null, null, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString());
     }
 
diff --git a/src/main/java/com/github/mybatisplus/wrapper/MyLambdaQueryWrapper.java b/src/main/java/com/github/mybatisplus/wrapper/MyJoinLambdaQueryWrapper.java
similarity index 82%
rename from src/main/java/com/github/mybatisplus/wrapper/MyLambdaQueryWrapper.java
rename to src/main/java/com/github/mybatisplus/wrapper/MyJoinLambdaQueryWrapper.java
index 5092634..76b17dd 100644
--- a/src/main/java/com/github/mybatisplus/wrapper/MyLambdaQueryWrapper.java
+++ b/src/main/java/com/github/mybatisplus/wrapper/MyJoinLambdaQueryWrapper.java
@@ -26,11 +26,11 @@ import java.util.stream.Collectors;
  * copy {@link com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper}
  */
 @SuppressWarnings("serial")
-public class MyLambdaQueryWrapper<T> extends MyAbstractLambdaWrapper<T, MyLambdaQueryWrapper<T>>
-        implements MySFunctionQuery<MyLambdaQueryWrapper<T>>, MyLambdaJoin<MyLambdaQueryWrapper<T>> {
+public class MyJoinLambdaQueryWrapper<T> extends MyAbstractLambdaWrapper<T, MyJoinLambdaQueryWrapper<T>>
+        implements MySFunctionQuery<MyJoinLambdaQueryWrapper<T>>, MyLambdaJoin<MyJoinLambdaQueryWrapper<T>> {
 
     /**
-     * 查询字段
+     * 查询字段 sql
      */
     private SharedString sqlSelect = new SharedString();
 
@@ -44,21 +44,23 @@ public class MyLambdaQueryWrapper<T> extends MyAbstractLambdaWrapper<T, MyLambda
      */
     private SharedString alias = new SharedString();
 
-
+    /**
+     * 查询的字段
+     */
     private List<SelectColumn> selectColumns = new ArrayList<>();
 
 
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(entity)
      */
-    public MyLambdaQueryWrapper() {
+    public MyJoinLambdaQueryWrapper() {
         this((T) null);
     }
 
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(entity)
      */
-    public MyLambdaQueryWrapper(T entity) {
+    public MyJoinLambdaQueryWrapper(T entity) {
         super.setEntity(entity);
         super.initNeed();
     }
@@ -66,7 +68,7 @@ public class MyLambdaQueryWrapper<T> extends MyAbstractLambdaWrapper<T, MyLambda
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(entity)
      */
-    public MyLambdaQueryWrapper(Class<T> entityClass) {
+    public MyJoinLambdaQueryWrapper(Class<T> entityClass) {
         super.setEntityClass(entityClass);
         super.initNeed();
     }
@@ -74,9 +76,9 @@ public class MyLambdaQueryWrapper<T> extends MyAbstractLambdaWrapper<T, MyLambda
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(...)
      */
-    MyLambdaQueryWrapper(T entity, Class<T> entityClass, SharedString sqlSelect, AtomicInteger paramNameSeq,
-                         Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
-                         SharedString lastSql, SharedString sqlComment, SharedString sqlFirst) {
+    MyJoinLambdaQueryWrapper(T entity, Class<T> entityClass, SharedString sqlSelect, AtomicInteger paramNameSeq,
+                             Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
+                             SharedString lastSql, SharedString sqlComment, SharedString sqlFirst) {
         super.setEntity(entity);
         super.setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -94,7 +96,7 @@ public class MyLambdaQueryWrapper<T> extends MyAbstractLambdaWrapper<T, MyLambda
      * @param columns 查询字段
      */
     @SafeVarargs
-    public final <S> MyLambdaQueryWrapper<T> select(SFunction<S, ?>... columns) {
+    public final <S> MyJoinLambdaQueryWrapper<T> select(SFunction<S, ?>... columns) {
         if (ArrayUtils.isNotEmpty(columns)) {
             for (SFunction<S, ?> s : columns) {
                 Class<S> clazz = MyLambdaUtils.getEntityClass(s);
@@ -106,7 +108,7 @@ public class MyLambdaQueryWrapper<T> extends MyAbstractLambdaWrapper<T, MyLambda
     }
 
     @Override
-    public <E> MyLambdaQueryWrapper<T> select(Class<E> entityClass, Predicate<TableFieldInfo> predicate) {
+    public <E> MyJoinLambdaQueryWrapper<T> select(Class<E> entityClass, Predicate<TableFieldInfo> predicate) {
         TableInfo info = TableInfoHelper.getTableInfo(entityClass);
         Assert.notNull(info, "table can not be find");
         info.getFieldList().stream().filter(predicate).collect(Collectors.toList()).forEach(
@@ -115,7 +117,7 @@ public class MyLambdaQueryWrapper<T> extends MyAbstractLambdaWrapper<T, MyLambda
     }
 
 
-    public final <S, X> MyLambdaQueryWrapper<T> selectAs(SFunction<S, ?> columns, SFunction<X, ?> alias) {
+    public final <S, X> MyJoinLambdaQueryWrapper<T> selectAs(SFunction<S, ?> columns, SFunction<X, ?> alias) {
         Class<S> clazz = MyLambdaUtils.getEntityClass(columns);
         TableInfo info = TableInfoHelper.getTableInfo(clazz);
         Assert.notNull(info, "table can not be find for lambda");
@@ -123,7 +125,7 @@ public class MyLambdaQueryWrapper<T> extends MyAbstractLambdaWrapper<T, MyLambda
         return typedThis;
     }
 
-    public final MyLambdaQueryWrapper<T> selectAll(Class<?> clazz) {
+    public final MyJoinLambdaQueryWrapper<T> selectAll(Class<?> clazz) {
         TableInfo info = TableInfoHelper.getTableInfo(clazz);
         Assert.notNull(info, "table can not be find -> %s", clazz);
         selectColumns.add(new SelectColumn(clazz, info.getTableName(), info.getKeyColumn(), null));
@@ -158,8 +160,8 @@ public class MyLambdaQueryWrapper<T> extends MyAbstractLambdaWrapper<T, MyLambda
      * <p>故 sqlSelect 不向下传递</p>
      */
     @Override
-    protected MyLambdaQueryWrapper<T> instance() {
-        return new MyLambdaQueryWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs,
+    protected MyJoinLambdaQueryWrapper<T> instance() {
+        return new MyJoinLambdaQueryWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs,
                 new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString());
     }
 
@@ -170,7 +172,7 @@ public class MyLambdaQueryWrapper<T> extends MyAbstractLambdaWrapper<T, MyLambda
     }
 
     @Override
-    public <L, X> MyLambdaQueryWrapper<T> join(String keyWord, boolean condition, Class<L> clazz, SFunction<L, ?> left, SFunction<X, ?> right) {
+    public <L, X> MyJoinLambdaQueryWrapper<T> join(String keyWord, boolean condition, Class<L> clazz, SFunction<L, ?> left, SFunction<X, ?> right) {
         if (condition) {
             TableInfo leftInfo = TableInfoHelper.getTableInfo(clazz);
             TableInfo rightInfo = TableInfoHelper.getTableInfo(MyLambdaUtils.getEntityClass(right));