From 468a28f8365c0b48e2fd2c13c093132feab8edea Mon Sep 17 00:00:00 2001
From: yulichang <yu_lichang@qq.com>
Date: Mon, 23 Oct 2023 00:15:25 +0800
Subject: [PATCH 01/88] =?UTF-8?q?fix=20select=E5=AD=90=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../github/yulichang/kt/KtLambdaWrapper.java  |    4 +-
 .../yulichang/wrapper/MPJLambdaWrapper.java   |    3 +-
 .../yulichang/wrapper/segments/SelectSub.java |  125 ++
 .../test/join/LambdaWrapperTest.java          |    6 +-
 .../yulichang/test/kt/LambdaWrapperTest.kt    | 1232 +++++++++--------
 5 files changed, 752 insertions(+), 618 deletions(-)
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectSub.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
index 8ab8c81..04f7d6d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
@@ -12,7 +12,6 @@ import com.github.yulichang.toolkit.KtUtils;
 import com.github.yulichang.toolkit.KtWrapperUtils;
 import com.github.yulichang.toolkit.TableList;
 import com.github.yulichang.toolkit.support.ColumnCache;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.github.yulichang.wrapper.interfaces.Chain;
 import com.github.yulichang.wrapper.interfaces.SelectWrapper;
 import com.github.yulichang.wrapper.resultmap.Label;
@@ -218,8 +217,7 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
         wrapper.subTableAlias = st;
         consumer.accept(wrapper);
         addCustomWrapper(wrapper);
-        String sql = KtWrapperUtils.buildSubSqlByWrapper(clazz, wrapper, alias.getName());
-        this.selectColumns.add(new SelectString(sql, hasAlias, this.alias));
+        this.selectColumns.add(new SelectSub(() -> KtWrapperUtils.buildSubSqlByWrapper(clazz, wrapper, alias.getName()), hasAlias, this.alias));
         return typedThis;
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index 33e157b..16d171c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -217,8 +217,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
         wrapper.subTableAlias = st;
         consumer.accept(wrapper);
         addCustomWrapper(wrapper);
-        String sql = WrapperUtils.buildSubSqlByWrapper(clazz, wrapper, LambdaUtils.getName(alias));
-        this.selectColumns.add(new SelectString(sql, hasAlias, this.alias));
+        this.selectColumns.add(new SelectSub(() -> WrapperUtils.buildSubSqlByWrapper(clazz, wrapper, LambdaUtils.getName(alias)), hasAlias, this.alias));
         return typedThis;
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectSub.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectSub.java
new file mode 100644
index 0000000..6b35a8d
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectSub.java
@@ -0,0 +1,125 @@
+package com.github.yulichang.wrapper.segments;
+
+import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.github.yulichang.wrapper.enums.BaseFuncEnum;
+import org.apache.ibatis.type.TypeHandler;
+
+import java.util.Objects;
+import java.util.function.Supplier;
+
+/**
+ * 子查询列
+ *
+ * @author yulichang
+ * @since 1.4.7
+ */
+public class SelectSub implements Select {
+
+    private final Supplier<String> column;
+
+    private final boolean hasTableAlias;
+
+    private final String tableAlias;
+
+    public SelectSub(Supplier<String> column, boolean hasTableAlias, String tableAlias) {
+        this.column = column;
+        this.hasTableAlias = hasTableAlias;
+        this.tableAlias = tableAlias;
+    }
+
+    @Override
+    public Class<?> getClazz() {
+        return null;
+    }
+
+    @Override
+    public Integer getIndex() {
+        return null;
+    }
+
+    @Override
+    public boolean isHasTableAlias() {
+        return this.hasTableAlias;
+    }
+
+    @Override
+    public String getTableAlias() {
+        return this.tableAlias;
+    }
+
+    @Override
+    public boolean isPk() {
+        return false;
+    }
+
+    @Override
+    public String getColumn() {
+        return Objects.isNull(column) ? StringPool.EMPTY : column.get();
+    }
+
+    @Override
+    public Class<?> getColumnType() {
+        return null;
+    }
+
+    @Override
+    public String getTagColumn() {
+        return null;
+    }
+
+    @Override
+    public String getColumProperty() {
+        return null;
+    }
+
+    @Override
+    public boolean hasTypeHandle() {
+        return false;
+    }
+
+    @Override
+    public TypeHandler<?> getTypeHandle() {
+        return null;
+    }
+
+    @Override
+    public boolean isHasAlias() {
+        return false;
+    }
+
+    @Override
+    public String getAlias() {
+        return null;
+    }
+
+    @Override
+    public TableFieldInfo getTableFieldInfo() {
+        return null;
+    }
+
+    @Override
+    public boolean isFunc() {
+        return false;
+    }
+
+    @Override
+    public SelectFunc.Arg[] getArgs() {
+        return null;
+    }
+
+    @Override
+    public BaseFuncEnum getFunc() {
+        return null;
+    }
+
+    @Override
+    public boolean isLabel() {
+        return false;
+    }
+
+    @Override
+    public boolean isStr() {
+        return true;
+    }
+}
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index de21cd0..1989687 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -1047,10 +1047,10 @@ class LambdaWrapperTest {
                 .le(UserDO::getId, 100);
         wrapper.list();
 
-        ThreadLocalUtils.set("SELECT ( SELECT st.id FROM address st WHERE st.del=false AND (st.id = t.id) limit 1 ) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t.id <= ?)");
+        ThreadLocalUtils.set("SELECT ( SELECT st.id FROM area st WHERE st.del=false AND (st.id = t1.id) limit 1 ) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t.id <= ?)");
         MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
-                .selectSub(AddressDO.class, w -> w.select(AddressDO::getId)
-                        .eq(AddressDO::getId, UserDO::getId)
+                .selectSub(AreaDO.class, w -> w.select(AreaDO::getId)
+                        .eq(AreaDO::getId, AddressDO::getId)
                         .last("limit 1"), UserDO::getId)
                 .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId)
                 .le(UserDO::getId, 100);
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/com/github/yulichang/test/kt/LambdaWrapperTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/com/github/yulichang/test/kt/LambdaWrapperTest.kt
index b6097b0..e974a64 100644
--- a/mybatis-plus-join-test/test-kotlin/src/test/com/github/yulichang/test/kt/LambdaWrapperTest.kt
+++ b/mybatis-plus-join-test/test-kotlin/src/test/com/github/yulichang/test/kt/LambdaWrapperTest.kt
@@ -55,48 +55,48 @@ class LambdaWrapperTest {
     @Test
     fun testJoin() {
         ThreadLocalUtils.set(
-            "SELECT t.id,\n" +
-                    "       t.pid,\n" +
-                    "       t.`name`,\n" +
-                    "       t.`json`,\n" +
-                    "       t.sex,\n" +
-                    "       t.head_img,\n" +
-                    "       t.create_time,\n" +
-                    "       t.address_id,\n" +
-                    "       t.address_id2,\n" +
-                    "       t.del,\n" +
-                    "       t.create_by,\n" +
-                    "       t.update_by,\n" +
-                    "       t1.id  AS joina_id,\n" +
-                    "       t1.user_id,\n" +
-                    "       t1.area_id,\n" +
-                    "       t1.tel,\n" +
-                    "       t1.address,\n" +
-                    "       t1.del AS joina_del,\n" +
-                    "       t2.id  AS joinb_id,\n" +
-                    "       t2.province,\n" +
-                    "       t2.city,\n" +
-                    "       t2.area,\n" +
-                    "       t2.postcode,\n" +
-                    "       t2.del AS joinb_del\n" +
-                    "FROM `user` t\n" +
-                    "         LEFT JOIN address t1 ON (t1.user_id = t.id)\n" +
-                    "         LEFT JOIN area t2 ON (t2.id = t1.area_id)\n" +
-                    "WHERE t.del = false\n" +
-                    "  AND t1.del = false\n" +
-                    "  AND t2.del = false\n" +
-                    "  AND (t.id <= ?)\n" +
-                    "ORDER BY t.id DESC"
+                "SELECT t.id,\n" +
+                        "       t.pid,\n" +
+                        "       t.`name`,\n" +
+                        "       t.`json`,\n" +
+                        "       t.sex,\n" +
+                        "       t.head_img,\n" +
+                        "       t.create_time,\n" +
+                        "       t.address_id,\n" +
+                        "       t.address_id2,\n" +
+                        "       t.del,\n" +
+                        "       t.create_by,\n" +
+                        "       t.update_by,\n" +
+                        "       t1.id  AS joina_id,\n" +
+                        "       t1.user_id,\n" +
+                        "       t1.area_id,\n" +
+                        "       t1.tel,\n" +
+                        "       t1.address,\n" +
+                        "       t1.del AS joina_del,\n" +
+                        "       t2.id  AS joinb_id,\n" +
+                        "       t2.province,\n" +
+                        "       t2.city,\n" +
+                        "       t2.area,\n" +
+                        "       t2.postcode,\n" +
+                        "       t2.del AS joinb_del\n" +
+                        "FROM `user` t\n" +
+                        "         LEFT JOIN address t1 ON (t1.user_id = t.id)\n" +
+                        "         LEFT JOIN area t2 ON (t2.id = t1.area_id)\n" +
+                        "WHERE t.del = false\n" +
+                        "  AND t1.del = false\n" +
+                        "  AND t2.del = false\n" +
+                        "  AND (t.id <= ?)\n" +
+                        "ORDER BY t.id DESC"
         )
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectAll(UserDO::class.java)
-            .selectCollection(AddressDO::class.java, UserDTO::addressList) { addr ->
-                addr.association(AreaDO::class.java, AddressDTO::area)
-            }
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
-            .le(UserDO::id, 10000)
-            .orderByDesc(UserDO::id)
+                .selectAll(UserDO::class.java)
+                .selectCollection(AddressDO::class.java, UserDTO::addressList) { addr ->
+                    addr.association(AreaDO::class.java, AddressDTO::area)
+                }
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
+                .le(UserDO::id, 10000)
+                .orderByDesc(UserDO::id)
         val list = userMapper!!.selectJoinList(UserDTO::class.java, wrapper)
         assert(list[0].addressList != null && list[0]!!.addressList!![0].id != null)
         list.forEach(System.out::println)
@@ -105,34 +105,34 @@ class LambdaWrapperTest {
     @Test
     fun testJoinField() {
         ThreadLocalUtils.set(
-            "SELECT t.id,\n" +
-                    "       t.pid,\n" +
-                    "       t.`name`,\n" +
-                    "       t.`json`,\n" +
-                    "       t.sex,\n" +
-                    "       t.head_img,\n" +
-                    "       t.create_time,\n" +
-                    "       t.address_id,\n" +
-                    "       t.address_id2,\n" +
-                    "       t.del,\n" +
-                    "       t.create_by,\n" +
-                    "       t.update_by,\n" +
-                    "       t1.id AS joina_id\n" +
-                    "FROM `user` t\n" +
-                    "         LEFT JOIN address t1 ON (t1.user_id = t.id)\n" +
-                    "WHERE t.del = false\n" +
-                    "  AND t1.del = false\n" +
-                    "  AND (t.id <= ?)\n" +
-                    "ORDER BY t.id DESC"
+                "SELECT t.id,\n" +
+                        "       t.pid,\n" +
+                        "       t.`name`,\n" +
+                        "       t.`json`,\n" +
+                        "       t.sex,\n" +
+                        "       t.head_img,\n" +
+                        "       t.create_time,\n" +
+                        "       t.address_id,\n" +
+                        "       t.address_id2,\n" +
+                        "       t.del,\n" +
+                        "       t.create_by,\n" +
+                        "       t.update_by,\n" +
+                        "       t1.id AS joina_id\n" +
+                        "FROM `user` t\n" +
+                        "         LEFT JOIN address t1 ON (t1.user_id = t.id)\n" +
+                        "WHERE t.del = false\n" +
+                        "  AND t1.del = false\n" +
+                        "  AND (t.id <= ?)\n" +
+                        "ORDER BY t.id DESC"
         )
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectAll(UserDO::class.java)
-            .selectCollection(AddressDO::class.java, UserDTO::addressIds) { e ->
-                e.id(AddressDO::id)
-            }
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .le(UserDO::id, 10000)
-            .orderByDesc(UserDO::id)
+                .selectAll(UserDO::class.java)
+                .selectCollection(AddressDO::class.java, UserDTO::addressIds) { e ->
+                    e.id(AddressDO::id)
+                }
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .le(UserDO::id, 10000)
+                .orderByDesc(UserDO::id)
         val list = userMapper!!.selectJoinList(UserDTO::class.java, wrapper)
         assert(list[0].addressIds != null)
         list.forEach(System.out::println)
@@ -142,46 +142,46 @@ class LambdaWrapperTest {
     @Test
     fun testJoin1() {
         ThreadLocalUtils.set(
-            "SELECT t.id,\n" +
-                    "       t.pid,\n" +
-                    "       t.`name`,\n" +
-                    "       t.`json`,\n" +
-                    "       t.sex,\n" +
-                    "       t.head_img,\n" +
-                    "       t.create_time,\n" +
-                    "       t.address_id,\n" +
-                    "       t.address_id2,\n" +
-                    "       t.del,\n" +
-                    "       t.create_by,\n" +
-                    "       t.update_by,\n" +
-                    "       t1.id  AS joina_id,\n" +
-                    "       t1.user_id,\n" +
-                    "       t1.area_id,\n" +
-                    "       t1.tel,\n" +
-                    "       t1.address,\n" +
-                    "       t1.del AS joina_del,\n" +
-                    "       t2.id  AS joinb_id,\n" +
-                    "       t2.province,\n" +
-                    "       t2.city,\n" +
-                    "       t2.area,\n" +
-                    "       t2.postcode,\n" +
-                    "       t2.del AS joinb_del\n" +
-                    "FROM `user` t\n" +
-                    "         LEFT JOIN address t1 ON (t1.user_id = t.id)\n" +
-                    "         LEFT JOIN area t2 ON (t2.id = t1.area_id)\n" +
-                    "WHERE t.del = false\n" +
-                    "  AND t1.del = false\n" +
-                    "  AND t2.del = false\n" +
-                    "ORDER BY t.id DESC"
+                "SELECT t.id,\n" +
+                        "       t.pid,\n" +
+                        "       t.`name`,\n" +
+                        "       t.`json`,\n" +
+                        "       t.sex,\n" +
+                        "       t.head_img,\n" +
+                        "       t.create_time,\n" +
+                        "       t.address_id,\n" +
+                        "       t.address_id2,\n" +
+                        "       t.del,\n" +
+                        "       t.create_by,\n" +
+                        "       t.update_by,\n" +
+                        "       t1.id  AS joina_id,\n" +
+                        "       t1.user_id,\n" +
+                        "       t1.area_id,\n" +
+                        "       t1.tel,\n" +
+                        "       t1.address,\n" +
+                        "       t1.del AS joina_del,\n" +
+                        "       t2.id  AS joinb_id,\n" +
+                        "       t2.province,\n" +
+                        "       t2.city,\n" +
+                        "       t2.area,\n" +
+                        "       t2.postcode,\n" +
+                        "       t2.del AS joinb_del\n" +
+                        "FROM `user` t\n" +
+                        "         LEFT JOIN address t1 ON (t1.user_id = t.id)\n" +
+                        "         LEFT JOIN area t2 ON (t2.id = t1.area_id)\n" +
+                        "WHERE t.del = false\n" +
+                        "  AND t1.del = false\n" +
+                        "  AND t2.del = false\n" +
+                        "ORDER BY t.id DESC"
         )
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectAll(UserDO::class.java)
-            .selectCollection(AddressDO::class.java, UserDTO::addressList) { addr ->
-                addr.association(AreaDO::class.java, AddressDTO::area)
-            }
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
-            .orderByDesc(UserDO::id)
+                .selectAll(UserDO::class.java)
+                .selectCollection(AddressDO::class.java, UserDTO::addressList) { addr ->
+                    addr.association(AreaDO::class.java, AddressDTO::area)
+                }
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
+                .orderByDesc(UserDO::id)
         val list = userMapper!!.selectJoinList(UserDTO::class.java, wrapper)
         assert(list[0]!!.addressList!![0].id != null)
         list.forEach(System.out::println)
@@ -190,40 +190,41 @@ class LambdaWrapperTest {
     /**
      * 基本数据类型测试
      */
+    @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
     @Test
     fun testWrapper() {
         ThreadLocalUtils.set(
-            "SELECT t.id\n" +
-                    "FROM `user` t\n" +
-                    "         LEFT JOIN address t1 ON (t1.user_id = t.id)\n" +
-                    "         LEFT JOIN area t2 ON (t2.id = t1.area_id)\n" +
-                    "WHERE t.del = false\n" +
-                    "  AND t1.del = false\n" +
-                    "  AND t2.del = false"
+                "SELECT t.id\n" +
+                        "FROM `user` t\n" +
+                        "         LEFT JOIN address t1 ON (t1.user_id = t.id)\n" +
+                        "         LEFT JOIN area t2 ON (t2.id = t1.area_id)\n" +
+                        "WHERE t.del = false\n" +
+                        "  AND t1.del = false\n" +
+                        "  AND t2.del = false"
         )
         //基本数据类型 和 String
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .select(UserDO::id)
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
+                .select(UserDO::id)
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
         val list: List<Integer> = userMapper!!.selectJoinList(Integer::class.java, wrapper)
         println(list)
 
 
         ThreadLocalUtils.set(
-            "SELECT t.create_time\n" +
-                    "FROM `user` t\n" +
-                    "         LEFT JOIN address t1 ON (t1.user_id = t.id)\n" +
-                    "         LEFT JOIN area t2 ON (t2.id = t1.area_id)\n" +
-                    "WHERE t.del = false\n" +
-                    "  AND t1.del = false\n" +
-                    "  AND t2.del = false"
+                "SELECT t.create_time\n" +
+                        "FROM `user` t\n" +
+                        "         LEFT JOIN address t1 ON (t1.user_id = t.id)\n" +
+                        "         LEFT JOIN area t2 ON (t2.id = t1.area_id)\n" +
+                        "WHERE t.del = false\n" +
+                        "  AND t1.del = false\n" +
+                        "  AND t2.del = false"
         )
         //java.sql包下的类
         val wrapper1: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .select(UserDO::createTime)
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
+                .select(UserDO::createTime)
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
         val list1: List<Timestamp> = userMapper.selectJoinList(Timestamp::class.java, wrapper1)
         println(list1)
     }
@@ -233,30 +234,30 @@ class LambdaWrapperTest {
     @SuppressWarnings("unchecked")
     fun testMSCache() {
         ThreadLocalUtils.set(
-            "SELECT t.id,\n" +
-                    "       t.pid,\n" +
-                    "       t.`name`,\n" +
-                    "       t.`json`,\n" +
-                    "       t.sex,\n" +
-                    "       t.head_img,\n" +
-                    "       t.create_time,\n" +
-                    "       t.address_id,\n" +
-                    "       t.address_id2,\n" +
-                    "       t.del,\n" +
-                    "       t.create_by,\n" +
-                    "       t.update_by\n" +
-                    "FROM `user` t\n" +
-                    "WHERE t.id = ?\n" +
-                    "  AND t.del = false\n" +
-                    "  AND (t.id <= ?)\n" +
-                    "ORDER BY t.id ASC, t.`name` ASC"
+                "SELECT t.id,\n" +
+                        "       t.pid,\n" +
+                        "       t.`name`,\n" +
+                        "       t.`json`,\n" +
+                        "       t.sex,\n" +
+                        "       t.head_img,\n" +
+                        "       t.create_time,\n" +
+                        "       t.address_id,\n" +
+                        "       t.address_id2,\n" +
+                        "       t.del,\n" +
+                        "       t.create_by,\n" +
+                        "       t.update_by\n" +
+                        "FROM `user` t\n" +
+                        "WHERE t.id = ?\n" +
+                        "  AND t.del = false\n" +
+                        "  AND (t.id <= ?)\n" +
+                        "ORDER BY t.id ASC, t.`name` ASC"
         )
         val user = UserDO()
         user.id = 1
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(user)
-            .selectAll(UserDO::class.java)
-            .le(UserDO::id, 100)
-            .orderByAsc(UserDO::id, UserDO::name)
+                .selectAll(UserDO::class.java)
+                .le(UserDO::id, 100)
+                .orderByAsc(UserDO::id, UserDO::name)
         val list = userMapper!!.selectList(wrapper)
         list.forEach(System.out::println)
     }
@@ -264,35 +265,35 @@ class LambdaWrapperTest {
     @Test
     fun testTableAliasR() {
         ThreadLocalUtils.set(
-            "SELECT tt.id,\n" +
-                    "       tt.user_id,\n" +
-                    "       tt.create_by,\n" +
-                    "       tt.update_by,\n" +
-                    "       ua.`name` AS userName,\n" +
-                    "       ub.`name` AS createName,\n" +
-                    "       uc.`name` AS updateName\n" +
-                    "FROM user_dto tt\n" +
-                    "         LEFT JOIN `user` ua ON (ua.id = tt.user_id)\n" +
-                    "         LEFT JOIN `user` ub ON (ub.id = tt.create_by)\n" +
-                    "         LEFT JOIN `user` uc ON (uc.id = tt.update_by)\n" +
-                    "WHERE ua.del = false\n" +
-                    "  AND ub.del = false\n" +
-                    "  AND uc.del = false\n" +
-                    "  AND (ua.id <= ? AND ub.id >= ?)"
+                "SELECT tt.id,\n" +
+                        "       tt.user_id,\n" +
+                        "       tt.create_by,\n" +
+                        "       tt.update_by,\n" +
+                        "       ua.`name` AS userName,\n" +
+                        "       ub.`name` AS createName,\n" +
+                        "       uc.`name` AS updateName\n" +
+                        "FROM user_dto tt\n" +
+                        "         LEFT JOIN `user` ua ON (ua.id = tt.user_id)\n" +
+                        "         LEFT JOIN `user` ub ON (ub.id = tt.create_by)\n" +
+                        "         LEFT JOIN `user` uc ON (uc.id = tt.update_by)\n" +
+                        "WHERE ua.del = false\n" +
+                        "  AND ub.del = false\n" +
+                        "  AND uc.del = false\n" +
+                        "  AND (ua.id <= ? AND ub.id >= ?)"
         )
         val wrapper: KtLambdaWrapper<UserDto> = KtWrappers.query("tt", UserDto::class.java)
-            .selectAll(UserDto::class.java)
-            .leftJoin(UserDO::class.java, "ua", UserDO::id, UserDto::userId) { ext ->
-                ext.selectAs(UserDO::name, UserDto::userName)
-                    .le(UserDO::id, 100)
-            }
-            .leftJoin(UserDO::class.java, "ub", UserDO::id, UserDto::createBy) { ext ->
-                ext.selectAs(UserDO::name, UserDto::createName)
-                    .ge(UserDO::id, 0)
-            }
-            .leftJoin(UserDO::class.java, "uc", UserDO::id, UserDto::updateBy) { ext ->
-                ext.selectAs(UserDO::name, UserDto::updateName)
-            }
+                .selectAll(UserDto::class.java)
+                .leftJoin(UserDO::class.java, "ua", UserDO::id, UserDto::userId) { ext ->
+                    ext.selectAs(UserDO::name, UserDto::userName)
+                            .le(UserDO::id, 100)
+                }
+                .leftJoin(UserDO::class.java, "ub", UserDO::id, UserDto::createBy) { ext ->
+                    ext.selectAs(UserDO::name, UserDto::createName)
+                            .ge(UserDO::id, 0)
+                }
+                .leftJoin(UserDO::class.java, "uc", UserDO::id, UserDto::updateBy) { ext ->
+                    ext.selectAs(UserDO::name, UserDto::updateName)
+                }
         val userDtos: List<UserDto> = userDTOMapper!!.selectJoinList(UserDto::class.java, wrapper)
         assert(StringUtils.isNotBlank(userDtos[0].userName))
         assert(StringUtils.isNotBlank(userDtos[0].createName))
@@ -300,41 +301,41 @@ class LambdaWrapperTest {
 
 
         ThreadLocalUtils.set(
-            "SELECT tt.id,\n" +
-                    "       tt.pid,\n" +
-                    "       tt.`name`,\n" +
-                    "       tt.`json`,\n" +
-                    "       tt.sex,\n" +
-                    "       tt.head_img,\n" +
-                    "       tt.create_time,\n" +
-                    "       tt.address_id,\n" +
-                    "       tt.address_id2,\n" +
-                    "       tt.del,\n" +
-                    "       tt.create_by,\n" +
-                    "       tt.update_by,\n" +
-                    "       ua.id,\n" +
-                    "       ub.head_img\n" +
-                    "FROM `user` tt\n" +
-                    "         LEFT JOIN `user` ua ON (ua.id = tt.pid)\n" +
-                    "         LEFT JOIN `user` ub ON (ub.id = tt.create_by)\n" +
-                    "         LEFT JOIN `user` uc ON (uc.id = tt.update_by)\n" +
-                    "WHERE tt.del = false\n" +
-                    "  AND ua.del = false\n" +
-                    "  AND ub.del = false\n" +
-                    "  AND uc.del = false\n" +
-                    "  AND (ua.head_img = tt.`name` AND tt.id = ua.id)"
+                "SELECT tt.id,\n" +
+                        "       tt.pid,\n" +
+                        "       tt.`name`,\n" +
+                        "       tt.`json`,\n" +
+                        "       tt.sex,\n" +
+                        "       tt.head_img,\n" +
+                        "       tt.create_time,\n" +
+                        "       tt.address_id,\n" +
+                        "       tt.address_id2,\n" +
+                        "       tt.del,\n" +
+                        "       tt.create_by,\n" +
+                        "       tt.update_by,\n" +
+                        "       ua.id,\n" +
+                        "       ub.head_img\n" +
+                        "FROM `user` tt\n" +
+                        "         LEFT JOIN `user` ua ON (ua.id = tt.pid)\n" +
+                        "         LEFT JOIN `user` ub ON (ub.id = tt.create_by)\n" +
+                        "         LEFT JOIN `user` uc ON (uc.id = tt.update_by)\n" +
+                        "WHERE tt.del = false\n" +
+                        "  AND ua.del = false\n" +
+                        "  AND ub.del = false\n" +
+                        "  AND uc.del = false\n" +
+                        "  AND (ua.head_img = tt.`name` AND tt.id = ua.id)"
         )
         val w: KtLambdaWrapper<UserDO> = KtWrappers.query("tt", UserDO::class.java)
-            .selectAll(UserDO::class.java)
-            .leftJoin(UserDO::class.java, "ua", UserDO::id, UserDO::pid) { ext ->
-                ext.select(UserDO::id)
-                    .eq(UserDO::img, UserDO::name)
-            }
-            .leftJoin(UserDO::class.java, "ub", UserDO::id, UserDO::createBy) { ext ->
-                ext.select(UserDO::img)
-            }
-            .leftJoin(UserDO::class.java, "uc", UserDO::id, UserDO::updateBy)
-            .eq(UserDO::id, UserDO::id)
+                .selectAll(UserDO::class.java)
+                .leftJoin(UserDO::class.java, "ua", UserDO::id, UserDO::pid) { ext ->
+                    ext.select(UserDO::id)
+                            .eq(UserDO::img, UserDO::name)
+                }
+                .leftJoin(UserDO::class.java, "ub", UserDO::id, UserDO::createBy) { ext ->
+                    ext.select(UserDO::img)
+                }
+                .leftJoin(UserDO::class.java, "uc", UserDO::id, UserDO::updateBy)
+                .eq(UserDO::id, UserDO::id)
         userMapper!!.selectJoinList(UserDO::class.java, w)
         println(1)
     }
@@ -345,139 +346,139 @@ class LambdaWrapperTest {
     @Test
     fun testInner() {
         ThreadLocalUtils.set(
-            "SELECT t.id,\n" +
-                    "       t.pid,\n" +
-                    "       t.`name`,\n" +
-                    "       t.`json`,\n" +
-                    "       t.sex,\n" +
-                    "       t.head_img,\n" +
-                    "       t.create_time,\n" +
-                    "       t.address_id,\n" +
-                    "       t.address_id2,\n" +
-                    "       t.del,\n" +
-                    "       t.create_by,\n" +
-                    "       t.update_by,\n" +
-                    "       t1.id          AS joina_id,\n" +
-                    "       t1.pid         AS joina_pid,\n" +
-                    "       t1.`name`      AS joina_name,\n" +
-                    "       t1.`json`      AS joina_json,\n" +
-                    "       t1.sex         AS joina_sex,\n" +
-                    "       t1.head_img    AS joina_head_img,\n" +
-                    "       t1.create_time AS joina_create_time,\n" +
-                    "       t1.address_id  AS joina_address_id,\n" +
-                    "       t1.address_id2 AS joina_address_id2,\n" +
-                    "       t1.del         AS joina_del,\n" +
-                    "       t1.create_by   AS joina_create_by,\n" +
-                    "       t1.update_by   AS joina_update_by\n" +
-                    "FROM `user` t\n" +
-                    "         LEFT JOIN `user` t1 ON (t1.pid = t.id)\n" +
-                    "WHERE t.del = false\n" +
-                    "  AND (t.id > ?)"
+                "SELECT t.id,\n" +
+                        "       t.pid,\n" +
+                        "       t.`name`,\n" +
+                        "       t.`json`,\n" +
+                        "       t.sex,\n" +
+                        "       t.head_img,\n" +
+                        "       t.create_time,\n" +
+                        "       t.address_id,\n" +
+                        "       t.address_id2,\n" +
+                        "       t.del,\n" +
+                        "       t.create_by,\n" +
+                        "       t.update_by,\n" +
+                        "       t1.id          AS joina_id,\n" +
+                        "       t1.pid         AS joina_pid,\n" +
+                        "       t1.`name`      AS joina_name,\n" +
+                        "       t1.`json`      AS joina_json,\n" +
+                        "       t1.sex         AS joina_sex,\n" +
+                        "       t1.head_img    AS joina_head_img,\n" +
+                        "       t1.create_time AS joina_create_time,\n" +
+                        "       t1.address_id  AS joina_address_id,\n" +
+                        "       t1.address_id2 AS joina_address_id2,\n" +
+                        "       t1.del         AS joina_del,\n" +
+                        "       t1.create_by   AS joina_create_by,\n" +
+                        "       t1.update_by   AS joina_update_by\n" +
+                        "FROM `user` t\n" +
+                        "         LEFT JOIN `user` t1 ON (t1.pid = t.id)\n" +
+                        "WHERE t.del = false\n" +
+                        "  AND (t.id > ?)"
         )
         //自连接
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .disableSubLogicDel()//关闭副表逻辑删除
-            .selectAll(UserDO::class.java)
-            .selectCollection(UserDO::class.java, UserDO::children)
-            .leftJoin(UserDO::class.java, UserDO::pid, UserDO::id)
-            .gt(UserDO::id, 0)
+                .disableSubLogicDel()//关闭副表逻辑删除
+                .selectAll(UserDO::class.java)
+                .selectCollection(UserDO::class.java, UserDO::children)
+                .leftJoin(UserDO::class.java, UserDO::pid, UserDO::id)
+                .gt(UserDO::id, 0)
         val list: List<UserDO> = userMapper!!.selectJoinList(UserDO::class.java, wrapper)
         println(list)
 
         ThreadLocalUtils.set(
-            "SELECT t.id,\n" +
-                    "       t.pid,\n" +
-                    "       t.`name`,\n" +
-                    "       t.`json`,\n" +
-                    "       t.sex,\n" +
-                    "       t.head_img,\n" +
-                    "       t.create_time,\n" +
-                    "       t.address_id,\n" +
-                    "       t.address_id2,\n" +
-                    "       t.del,\n" +
-                    "       t.create_by,\n" +
-                    "       t.update_by,\n" +
-                    "       t1.`name` AS createName,\n" +
-                    "       t2.`name` AS updateName\n" +
-                    "FROM `user` t\n" +
-                    "         LEFT JOIN `user` t1 ON (t1.id = t.create_by)\n" +
-                    "         LEFT JOIN `user` t2 ON (t2.id = t.update_by)\n" +
-                    "WHERE (t2.id = t.update_by AND t.id = t1.id)"
+                "SELECT t.id,\n" +
+                        "       t.pid,\n" +
+                        "       t.`name`,\n" +
+                        "       t.`json`,\n" +
+                        "       t.sex,\n" +
+                        "       t.head_img,\n" +
+                        "       t.create_time,\n" +
+                        "       t.address_id,\n" +
+                        "       t.address_id2,\n" +
+                        "       t.del,\n" +
+                        "       t.create_by,\n" +
+                        "       t.update_by,\n" +
+                        "       t1.`name` AS createName,\n" +
+                        "       t2.`name` AS updateName\n" +
+                        "FROM `user` t\n" +
+                        "         LEFT JOIN `user` t1 ON (t1.id = t.create_by)\n" +
+                        "         LEFT JOIN `user` t2 ON (t2.id = t.update_by)\n" +
+                        "WHERE (t2.id = t.update_by AND t.id = t1.id)"
         )
         //关联一张表多次
         val wrapper1: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .disableLogicDel()
-            .disableSubLogicDel()
-            .selectAll(UserDO::class.java)
-            .leftJoin(UserDO::class.java, UserDO::id, UserDO::createBy) { ext ->
-                ext.selectAs(UserDO::name, UserDO::createName)
-            }
-            .leftJoin(UserDO::class.java) { on, ext ->
-                on.eq(UserDO::id, UserDO::updateBy)
-                ext.selectAs(UserDO::name, UserDO::updateName)
-                    .eq(UserDO::id, UserDO::updateBy)
-            }
-            .eq(UserDO::id, UserDO::id)
+                .disableLogicDel()
+                .disableSubLogicDel()
+                .selectAll(UserDO::class.java)
+                .leftJoin(UserDO::class.java, UserDO::id, UserDO::createBy) { ext ->
+                    ext.selectAs(UserDO::name, UserDO::createName)
+                }
+                .leftJoin(UserDO::class.java) { on, ext ->
+                    on.eq(UserDO::id, UserDO::updateBy)
+                    ext.selectAs(UserDO::name, UserDO::updateName)
+                            .eq(UserDO::id, UserDO::updateBy)
+                }
+                .eq(UserDO::id, UserDO::id)
         val dos: List<UserDO> = userMapper.selectJoinList(UserDO::class.java, wrapper1)
         assert(dos[0].createName != null && dos[0].updateName != null)
 
 
         ThreadLocalUtils.set(
-            "SELECT t.id,\n" +
-                    "       t.pid,\n" +
-                    "       t.`name`,\n" +
-                    "       t.`json`,\n" +
-                    "       t.sex,\n" +
-                    "       t.head_img,\n" +
-                    "       t.create_time,\n" +
-                    "       t.address_id,\n" +
-                    "       t.address_id2,\n" +
-                    "       t.del,\n" +
-                    "       t.create_by,\n" +
-                    "       t.update_by,\n" +
-                    "       t1.`name`      AS alias,\n" +
-                    "       t1.id          AS joina_id,\n" +
-                    "       t1.pid         AS joina_pid,\n" +
-                    "       t1.`name`      AS joina_name,\n" +
-                    "       t1.`json`      AS joina_json,\n" +
-                    "       t1.sex         AS joina_sex,\n" +
-                    "       t1.head_img    AS joina_head_img,\n" +
-                    "       t1.create_time AS joina_create_time,\n" +
-                    "       t1.address_id  AS joina_address_id,\n" +
-                    "       t1.address_id2 AS joina_address_id2,\n" +
-                    "       t1.del         AS joina_del,\n" +
-                    "       t1.create_by   AS joina_create_by,\n" +
-                    "       t1.update_by   AS joina_update_by,\n" +
-                    "       t2.id          AS joinb_id,\n" +
-                    "       t2.pid         AS joinb_pid,\n" +
-                    "       t2.`name`      AS joinb_name,\n" +
-                    "       t2.`json`      AS joinb_json,\n" +
-                    "       t2.sex         AS joinb_sex,\n" +
-                    "       t2.head_img    AS joinb_head_img,\n" +
-                    "       t2.create_time AS joinb_create_time,\n" +
-                    "       t2.address_id  AS joinb_address_id,\n" +
-                    "       t2.address_id2 AS joinb_address_id2,\n" +
-                    "       t2.del         AS joinb_del,\n" +
-                    "       t2.create_by   AS joinb_create_by,\n" +
-                    "       t2.update_by   AS joinb_update_by\n" +
-                    "FROM `user` t\n" +
-                    "         LEFT JOIN `user` t1 ON (t1.pid = t.id)\n" +
-                    "         LEFT JOIN `user` t2 ON (t2.pid = t1.id)\n" +
-                    "WHERE t.del = false\n" +
-                    "  AND (t1.id <= ? AND t.id <= ?)"
+                "SELECT t.id,\n" +
+                        "       t.pid,\n" +
+                        "       t.`name`,\n" +
+                        "       t.`json`,\n" +
+                        "       t.sex,\n" +
+                        "       t.head_img,\n" +
+                        "       t.create_time,\n" +
+                        "       t.address_id,\n" +
+                        "       t.address_id2,\n" +
+                        "       t.del,\n" +
+                        "       t.create_by,\n" +
+                        "       t.update_by,\n" +
+                        "       t1.`name`      AS alias,\n" +
+                        "       t1.id          AS joina_id,\n" +
+                        "       t1.pid         AS joina_pid,\n" +
+                        "       t1.`name`      AS joina_name,\n" +
+                        "       t1.`json`      AS joina_json,\n" +
+                        "       t1.sex         AS joina_sex,\n" +
+                        "       t1.head_img    AS joina_head_img,\n" +
+                        "       t1.create_time AS joina_create_time,\n" +
+                        "       t1.address_id  AS joina_address_id,\n" +
+                        "       t1.address_id2 AS joina_address_id2,\n" +
+                        "       t1.del         AS joina_del,\n" +
+                        "       t1.create_by   AS joina_create_by,\n" +
+                        "       t1.update_by   AS joina_update_by,\n" +
+                        "       t2.id          AS joinb_id,\n" +
+                        "       t2.pid         AS joinb_pid,\n" +
+                        "       t2.`name`      AS joinb_name,\n" +
+                        "       t2.`json`      AS joinb_json,\n" +
+                        "       t2.sex         AS joinb_sex,\n" +
+                        "       t2.head_img    AS joinb_head_img,\n" +
+                        "       t2.create_time AS joinb_create_time,\n" +
+                        "       t2.address_id  AS joinb_address_id,\n" +
+                        "       t2.address_id2 AS joinb_address_id2,\n" +
+                        "       t2.del         AS joinb_del,\n" +
+                        "       t2.create_by   AS joinb_create_by,\n" +
+                        "       t2.update_by   AS joinb_update_by\n" +
+                        "FROM `user` t\n" +
+                        "         LEFT JOIN `user` t1 ON (t1.pid = t.id)\n" +
+                        "         LEFT JOIN `user` t2 ON (t2.pid = t1.id)\n" +
+                        "WHERE t.del = false\n" +
+                        "  AND (t1.id <= ? AND t.id <= ?)"
         )
         val wrapper2: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .disableSubLogicDel()
-            .selectAll(UserDO::class.java)
-            .selectCollection("t1", UserDO::class.java, UserDO::children) { c ->
-                c.collection("t2", UserDO::class.java, UserDO::children)
-            }
-            .leftJoin(UserDO::class.java, UserDO::pid, UserDO::id) { ext ->
-                ext.selectAs(UserDO::name, UserDO::alias)
-                    .leftJoin(UserDO::class.java, UserDO::pid, UserDO::id)
-                    .le(UserDO::id, 5)
-            }
-            .le(UserDO::id, 4)
+                .disableSubLogicDel()
+                .selectAll(UserDO::class.java)
+                .selectCollection("t1", UserDO::class.java, UserDO::children) { c ->
+                    c.collection("t2", UserDO::class.java, UserDO::children)
+                }
+                .leftJoin(UserDO::class.java, UserDO::pid, UserDO::id) { ext ->
+                    ext.selectAs(UserDO::name, UserDO::alias)
+                            .leftJoin(UserDO::class.java, UserDO::pid, UserDO::id)
+                            .le(UserDO::id, 5)
+                }
+                .le(UserDO::id, 4)
         val list1: List<UserDO> = userMapper.selectJoinList(UserDO::class.java, wrapper2)
         println(list1)
     }
@@ -491,7 +492,7 @@ class LambdaWrapperTest {
         assert(l1.size == 14)
 
         val l2: List<UserDTO> = userMapper.selectJoinList(
-            UserDTO::class.java, KtWrappers.query(UserDO::class.java)
+                UserDTO::class.java, KtWrappers.query(UserDO::class.java)
                 .selectAll(UserDO::class.java)
                 .select(AddressDO::address)
                 .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
@@ -499,7 +500,7 @@ class LambdaWrapperTest {
         assert(l2.size == 10)
 
         val l3: List<UserDTO> = userMapper.selectJoinList(
-            UserDTO::class.java, KtWrappers.query(UserDO::class.java)
+                UserDTO::class.java, KtWrappers.query(UserDO::class.java)
                 .disableSubLogicDel()
                 .selectAll(UserDO::class.java)
                 .selectCollection(AddressDO::class.java, UserDTO::addressList)
@@ -508,15 +509,15 @@ class LambdaWrapperTest {
         assert(l3.size == 14 && l3[0].addressList!!.size == 9)
 
         val l4: List<UserDTO> = userMapper.selectJoinList(
-            UserDTO::class.java,
-            KtWrappers.query(UserDO::class.java)
-                .disableSubLogicDel()
-                .selectAll(UserDO::class.java)
-                .selectCollection(AddressDO::class.java, UserDTO::addressList)
-                .leftJoin(AddressDO::class.java) { on ->
-                    on.eq(AddressDO::userId, UserDO::id)
-                        .eq(AddressDO::del, false)
-                }
+                UserDTO::class.java,
+                KtWrappers.query(UserDO::class.java)
+                        .disableSubLogicDel()
+                        .selectAll(UserDO::class.java)
+                        .selectCollection(AddressDO::class.java, UserDTO::addressList)
+                        .leftJoin(AddressDO::class.java) { on ->
+                            on.eq(AddressDO::userId, UserDO::id)
+                                    .eq(AddressDO::del, false)
+                        }
         )
         assert(l4.size == 14 && l4[0].addressList!!.size == 5)
     }
@@ -528,9 +529,9 @@ class LambdaWrapperTest {
     @Test
     fun testAlias() {
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectAll(UserDO::class.java)
-            .selectCollection(UserDO::class.java, UserDO::children)
-            .leftJoin(UserDO::class.java, UserDO::pid, UserDO::id)
+                .selectAll(UserDO::class.java)
+                .selectCollection(UserDO::class.java, UserDO::children)
+                .leftJoin(UserDO::class.java, UserDO::pid, UserDO::id)
         val list: List<UserDO> = userMapper!!.selectJoinList(UserDO::class.java, wrapper)
         assert(list[0].name != null && list[0].children!![0].name != null)
         assert(list[0].img != null && list[0].children!![0].img != null)
@@ -540,33 +541,33 @@ class LambdaWrapperTest {
     @Test
     fun testTableAlias() {
         ThreadLocalUtils.set(
-            "SELECT t.id,\n" +
-                    "       t.pid,\n" +
-                    "       t.`name`,\n" +
-                    "       t.`json`,\n" +
-                    "       t.sex,\n" +
-                    "       t.head_img,\n" +
-                    "       t.create_time,\n" +
-                    "       t.address_id,\n" +
-                    "       t.address_id2,\n" +
-                    "       t.del,\n" +
-                    "       t.create_by,\n" +
-                    "       t.update_by,\n" +
-                    "       aa.id,\n" +
-                    "       aa.user_id,\n" +
-                    "       aa.area_id,\n" +
-                    "       aa.tel,\n" +
-                    "       aa.address,\n" +
-                    "       aa.del\n" +
-                    "FROM `user` t\n" +
-                    "         LEFT JOIN address aa ON (aa.user_id = t.id)\n" +
-                    "WHERE t.del = false\n" +
-                    "  AND aa.del = false"
+                "SELECT t.id,\n" +
+                        "       t.pid,\n" +
+                        "       t.`name`,\n" +
+                        "       t.`json`,\n" +
+                        "       t.sex,\n" +
+                        "       t.head_img,\n" +
+                        "       t.create_time,\n" +
+                        "       t.address_id,\n" +
+                        "       t.address_id2,\n" +
+                        "       t.del,\n" +
+                        "       t.create_by,\n" +
+                        "       t.update_by,\n" +
+                        "       aa.id,\n" +
+                        "       aa.user_id,\n" +
+                        "       aa.area_id,\n" +
+                        "       aa.tel,\n" +
+                        "       aa.address,\n" +
+                        "       aa.del\n" +
+                        "FROM `user` t\n" +
+                        "         LEFT JOIN address aa ON (aa.user_id = t.id)\n" +
+                        "WHERE t.del = false\n" +
+                        "  AND aa.del = false"
         )
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectAll(UserDO::class.java)
-            .selectAll(AddressDO::class.java, "aa")
-            .leftJoin(AddressDO::class.java, "aa", AddressDO::userId, UserDO::id)
+                .selectAll(UserDO::class.java)
+                .selectAll(AddressDO::class.java, "aa")
+                .leftJoin(AddressDO::class.java, "aa", AddressDO::userId, UserDO::id)
         val list: List<UserDO> = userMapper!!.selectJoinList(UserDO::class.java, wrapper)
         println(list)
     }
@@ -574,12 +575,12 @@ class LambdaWrapperTest {
     @Test
     fun testLabel() {
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .disableSubLogicDel()
-            .selectAll(UserDO::class.java)
-            .selectCollection("t1", AddressDO::class.java, UserDO::addressList)
-            .selectCollection("t2", AddressDO::class.java, UserDO::addressList2)
-            .leftJoin(AddressDO::class.java, AddressDO::id, UserDO::addressId)
-            .leftJoin(AddressDO::class.java, AddressDO::id, UserDO::addressId2)
+                .disableSubLogicDel()
+                .selectAll(UserDO::class.java)
+                .selectCollection("t1", AddressDO::class.java, UserDO::addressList)
+                .selectCollection("t2", AddressDO::class.java, UserDO::addressList2)
+                .leftJoin(AddressDO::class.java, AddressDO::id, UserDO::addressId)
+                .leftJoin(AddressDO::class.java, AddressDO::id, UserDO::addressId2)
         val list: List<UserDO> = userMapper!!.selectJoinList(UserDO::class.java, wrapper)
 
         assert(list[0].addressList!![0].address != null)
@@ -596,15 +597,15 @@ class LambdaWrapperTest {
         val page: Page<UserDTO> = Page(1, 10)
         page.setSearchCount(false)
         val iPage: IPage<UserDTO> = userMapper!!.selectJoinPage(
-            page, UserDTO::class.java,
-            KtWrappers.query(UserDO::class.java)
-                .selectAll(
-                    UserDO::class.java
-                )
-                .select(AddressDO::address)
-                .select(AreaDO::province)
-                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-                .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
+                page, UserDTO::class.java,
+                KtWrappers.query(UserDO::class.java)
+                        .selectAll(
+                                UserDO::class.java
+                        )
+                        .select(AddressDO::address)
+                        .select(AreaDO::province)
+                        .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                        .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
         )
         iPage.records.forEach(System.out::println)
     }
@@ -616,42 +617,42 @@ class LambdaWrapperTest {
     @Test
     fun test3() {
         ThreadLocalUtils.set(
-            "SELECT t.id,\n" +
-                    "       t.pid,\n" +
-                    "       t.`name`,\n" +
-                    "       t.`json`,\n" +
-                    "       t.sex,\n" +
-                    "       t.head_img,\n" +
-                    "       t.create_time,\n" +
-                    "       t.address_id,\n" +
-                    "       t.address_id2,\n" +
-                    "       t.del,\n" +
-                    "       t.create_by,\n" +
-                    "       t.update_by,\n" +
-                    "       t1.address\n" +
-                    "FROM `user` t\n" +
-                    "         LEFT JOIN address t1 ON (t.id = t1.user_id AND t.id = t1.user_id)\n" +
-                    "WHERE t.del = false\n" +
-                    "  AND t1.del = false\n" +
-                    "  AND (t.id = ? AND (t.head_img = ? OR t1.user_id = ?) AND t.id = ?)\n" +
-                    "LIMIT ?"
+                "SELECT t.id,\n" +
+                        "       t.pid,\n" +
+                        "       t.`name`,\n" +
+                        "       t.`json`,\n" +
+                        "       t.sex,\n" +
+                        "       t.head_img,\n" +
+                        "       t.create_time,\n" +
+                        "       t.address_id,\n" +
+                        "       t.address_id2,\n" +
+                        "       t.del,\n" +
+                        "       t.create_by,\n" +
+                        "       t.update_by,\n" +
+                        "       t1.address\n" +
+                        "FROM `user` t\n" +
+                        "         LEFT JOIN address t1 ON (t.id = t1.user_id AND t.id = t1.user_id)\n" +
+                        "WHERE t.del = false\n" +
+                        "  AND t1.del = false\n" +
+                        "  AND (t.id = ? AND (t.head_img = ? OR t1.user_id = ?) AND t.id = ?)\n" +
+                        "LIMIT ?"
         )
         val page: IPage<UserDTO> = userMapper!!.selectJoinPage(
-            Page(1, 10), UserDTO::class.java,
-            KtWrappers.query(UserDO::class.java)
-                .selectAll(UserDO::class.java)
-                .select(AddressDO::address)
-                .leftJoin(AddressDO::class.java) { on ->
-                    on.eq(UserDO::id, AddressDO::userId)
-                        .eq(UserDO::id, AddressDO::userId)
-                }
-                .eq(UserDO::id, 1)
-                .and { i ->
-                    i.eq(UserDO::img, "er")
-                        .or()
-                        .eq(AddressDO::userId, 1)
-                }
-                .eq(UserDO::id, 1)
+                Page(1, 10), UserDTO::class.java,
+                KtWrappers.query(UserDO::class.java)
+                        .selectAll(UserDO::class.java)
+                        .select(AddressDO::address)
+                        .leftJoin(AddressDO::class.java) { on ->
+                            on.eq(UserDO::id, AddressDO::userId)
+                                    .eq(UserDO::id, AddressDO::userId)
+                        }
+                        .eq(UserDO::id, 1)
+                        .and { i ->
+                            i.eq(UserDO::img, "er")
+                                    .or()
+                                    .eq(AddressDO::userId, 1)
+                        }
+                        .eq(UserDO::id, 1)
         )
         page.records.forEach(System.out::println)
     }
@@ -662,7 +663,7 @@ class LambdaWrapperTest {
     @Test
     fun test4() {
         val one: UserDTO = userMapper!!.selectJoinOne(
-            UserDTO::class.java, KtWrappers.query(UserDO::class.java)
+                UserDTO::class.java, KtWrappers.query(UserDO::class.java)
                 .selectSum(UserDO::id)
                 .selectMax(UserDO::id, UserDTO::headImg)
                 .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
@@ -677,10 +678,10 @@ class LambdaWrapperTest {
     @Test
     fun test6() {
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectAll(UserDO::class.java)
-            .selectFilter(AddressDO::class.java) { true }
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .eq(UserDO::id, 1)
+                .selectAll(UserDO::class.java)
+                .selectFilter(AddressDO::class.java) { true }
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .eq(UserDO::id, 1)
         val page: IPage<UserDTO> = userMapper!!.selectJoinPage(Page(1, 10), UserDTO::class.java, wrapper)
         assert(page.records[0].address != null)
         page.records.forEach(System.out::println)
@@ -693,8 +694,8 @@ class LambdaWrapperTest {
     fun test8() {
         ThreadLocalUtils.set("SELECT t.`name` FROM `user` t WHERE t.del=false AND (t.`name` = ?)")
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .select(UserDO::name)
-            .eq(UserDO::name, "ref")
+                .select(UserDO::name)
+                .eq(UserDO::name, "ref")
         userMapper!!.selectList(wrapper)
         try {
             userMapper.insertBatchSomeColumn(ArrayList())
@@ -709,10 +710,10 @@ class LambdaWrapperTest {
     @Test
     fun test7() {
         val list: List<Map<String, Any>> = userMapper!!.selectJoinMaps(
-            KtWrappers.query(UserDO::class.java)
-                .selectAll(UserDO::class.java)
-                .select(AddressDO::address)
-                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                KtWrappers.query(UserDO::class.java)
+                        .selectAll(UserDO::class.java)
+                        .select(AddressDO::address)
+                        .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
         )
         assert(list[0]["ADDRESS"] != null || list[0]["address"] != null)
         list.forEach(System.out::println)
@@ -724,20 +725,20 @@ class LambdaWrapperTest {
     @Test
     fun testMP() {
         val dos: MutableList<UserDO?>? = userMapper!!.selectList(
-            KtWrappers.query(UserDO::class.java)
-                .gt(UserDO::id, 3)
-                .lt(UserDO::id, 8)
+                KtWrappers.query(UserDO::class.java)
+                        .gt(UserDO::id, 3)
+                        .lt(UserDO::id, 8)
         )
         assert(dos!!.size == 4)
 
         ThreadLocalUtils.set(
-            "SELECT id,pid,`name`,`json`,sex,head_img,create_time,address_id,address_id2,del,create_by,update_by FROM `user` t WHERE t.del=false AND (t.id > ? AND t.id < ?)",
-            "SELECT * FROM `user` t WHERE t.del=false AND (t.id > ? AND t.id < ?) "
+                "SELECT id,pid,`name`,`json`,sex,head_img,create_time,address_id,address_id2,del,create_by,update_by FROM `user` t WHERE t.del=false AND (t.id > ? AND t.id < ?)",
+                "SELECT * FROM `user` t WHERE t.del=false AND (t.id > ? AND t.id < ?) "
         )
         val dos1: MutableList<UserDO?>? = userMapper.selectList(
-            KtWrappers.query(UserDO::class.java)
-                .gt(UserDO::id, 3)
-                .lt(UserDO::id, 8)
+                KtWrappers.query(UserDO::class.java)
+                        .gt(UserDO::id, 3)
+                        .lt(UserDO::id, 8)
         )
         assert(dos1!!.size == 4)
     }
@@ -749,14 +750,14 @@ class LambdaWrapperTest {
     fun testFunc() {
         ThreadLocalUtils.set("SELECT if(t1.user_id < 5,t1.user_id,t1.user_id + 100) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false")
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectFunc(
-                "if(%s < 5,%s,%s + 100)",
-                { arg -> arg.accept(AddressDO::userId, AddressDO::userId, AddressDO::userId) }, UserDO::id
-            )
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .selectFunc(
+                        "if(%s < 5,%s,%s + 100)",
+                        { arg -> arg.accept(AddressDO::userId, AddressDO::userId, AddressDO::userId) }, UserDO::id
+                )
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
 
         try {
-            val dos: List<UserDO> = userMapper!!.selectJoinList(UserDO::class.java, wrapper)
+            userMapper!!.selectJoinList(UserDO::class.java, wrapper)
         } catch (_: BadSqlGrammarException) {
         }
     }
@@ -767,15 +768,15 @@ class LambdaWrapperTest {
     @Test
     fun testGeneric() {
         val wrapper: KtLambdaWrapper<AddressDO> = KtWrappers.query(AddressDO::class.java)
-            .selectAll(AddressDO::class.java)
-            .le(AddressDO::id, 10000)
-            .orderByDesc(AddressDO::id)
+                .selectAll(AddressDO::class.java)
+                .le(AddressDO::id, 10000)
+                .orderByDesc(AddressDO::id)
         val list: List<AddressDTO> = addressMapper!!.selectJoinList(AddressDTO::class.java, wrapper)
         assert(
-            Objects.equals(
-                "[AddressDTO(id=22, userId=22, areaId=10022, tel=10000000022, address=朝阳22, del=false, areaList=null, area=null), AddressDTO(id=21, userId=21, areaId=10021, tel=10000000021, address=朝阳21, del=false, areaList=null, area=null), AddressDTO(id=20, userId=20, areaId=10020, tel=10000000020, address=朝阳20, del=false, areaList=null, area=null), AddressDTO(id=19, userId=19, areaId=10019, tel=10000000019, address=朝阳19, del=false, areaList=null, area=null), AddressDTO(id=18, userId=18, areaId=10018, tel=10000000018, address=朝阳18, del=false, areaList=null, area=null), AddressDTO(id=17, userId=17, areaId=10017, tel=10000000017, address=朝阳17, del=false, areaList=null, area=null), AddressDTO(id=16, userId=16, areaId=10016, tel=10000000016, address=朝阳16, del=false, areaList=null, area=null), AddressDTO(id=15, userId=15, areaId=10015, tel=10000000015, address=朝阳15, del=false, areaList=null, area=null), AddressDTO(id=14, userId=14, areaId=10014, tel=10000000014, address=朝阳14, del=false, areaList=null, area=null), AddressDTO(id=13, userId=13, areaId=10013, tel=10000000013, address=朝阳13, del=false, areaList=null, area=null), AddressDTO(id=12, userId=12, areaId=10012, tel=10000000012, address=朝阳12, del=false, areaList=null, area=null), AddressDTO(id=11, userId=11, areaId=10011, tel=10000000011, address=朝阳11, del=false, areaList=null, area=null), AddressDTO(id=10, userId=10, areaId=10010, tel=10000000010, address=朝阳10, del=false, areaList=null, area=null), AddressDTO(id=5, userId=1, areaId=10005, tel=10000000005, address=朝阳05, del=false, areaList=null, area=null), AddressDTO(id=4, userId=1, areaId=10004, tel=10000000004, address=朝阳04, del=false, areaList=null, area=null), AddressDTO(id=3, userId=1, areaId=10003, tel=10000000003, address=朝阳03, del=false, areaList=null, area=null), AddressDTO(id=2, userId=1, areaId=10002, tel=10000000002, address=朝阳02, del=false, areaList=null, area=null), AddressDTO(id=1, userId=1, areaId=10001, tel=10000000001, address=朝阳01, del=false, areaList=null, area=null)]",
-                list.toString()
-            )
+                Objects.equals(
+                        "[AddressDTO(id=22, userId=22, areaId=10022, tel=10000000022, address=朝阳22, del=false, areaList=null, area=null), AddressDTO(id=21, userId=21, areaId=10021, tel=10000000021, address=朝阳21, del=false, areaList=null, area=null), AddressDTO(id=20, userId=20, areaId=10020, tel=10000000020, address=朝阳20, del=false, areaList=null, area=null), AddressDTO(id=19, userId=19, areaId=10019, tel=10000000019, address=朝阳19, del=false, areaList=null, area=null), AddressDTO(id=18, userId=18, areaId=10018, tel=10000000018, address=朝阳18, del=false, areaList=null, area=null), AddressDTO(id=17, userId=17, areaId=10017, tel=10000000017, address=朝阳17, del=false, areaList=null, area=null), AddressDTO(id=16, userId=16, areaId=10016, tel=10000000016, address=朝阳16, del=false, areaList=null, area=null), AddressDTO(id=15, userId=15, areaId=10015, tel=10000000015, address=朝阳15, del=false, areaList=null, area=null), AddressDTO(id=14, userId=14, areaId=10014, tel=10000000014, address=朝阳14, del=false, areaList=null, area=null), AddressDTO(id=13, userId=13, areaId=10013, tel=10000000013, address=朝阳13, del=false, areaList=null, area=null), AddressDTO(id=12, userId=12, areaId=10012, tel=10000000012, address=朝阳12, del=false, areaList=null, area=null), AddressDTO(id=11, userId=11, areaId=10011, tel=10000000011, address=朝阳11, del=false, areaList=null, area=null), AddressDTO(id=10, userId=10, areaId=10010, tel=10000000010, address=朝阳10, del=false, areaList=null, area=null), AddressDTO(id=5, userId=1, areaId=10005, tel=10000000005, address=朝阳05, del=false, areaList=null, area=null), AddressDTO(id=4, userId=1, areaId=10004, tel=10000000004, address=朝阳04, del=false, areaList=null, area=null), AddressDTO(id=3, userId=1, areaId=10003, tel=10000000003, address=朝阳03, del=false, areaList=null, area=null), AddressDTO(id=2, userId=1, areaId=10002, tel=10000000002, address=朝阳02, del=false, areaList=null, area=null), AddressDTO(id=1, userId=1, areaId=10001, tel=10000000001, address=朝阳01, del=false, areaList=null, area=null)]",
+                        list.toString()
+                )
         )
     }
 
@@ -785,20 +786,20 @@ class LambdaWrapperTest {
     @Test
     fun testCount() {
         ThreadLocalUtils.set(
-            "SELECT COUNT( 1 ) FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) LEFT JOIN area t2 ON (t2.id = t1.area_id) WHERE t.del=false AND t1.del=false AND t2.del=false",
-            "SELECT COUNT( * ) FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) LEFT JOIN area t2 ON (t2.id = t1.area_id) WHERE t.del=false AND t1.del=false AND t2.del=false",
-            "SELECT COUNT( * ) AS total FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) LEFT JOIN area t2 ON (t2.id = t1.area_id) WHERE t.del=false AND t1.del=false AND t2.del=false"
+                "SELECT COUNT( 1 ) FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) LEFT JOIN area t2 ON (t2.id = t1.area_id) WHERE t.del=false AND t1.del=false AND t2.del=false",
+                "SELECT COUNT( * ) FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) LEFT JOIN area t2 ON (t2.id = t1.area_id) WHERE t.del=false AND t1.del=false AND t2.del=false",
+                "SELECT COUNT( * ) AS total FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) LEFT JOIN area t2 ON (t2.id = t1.area_id) WHERE t.del=false AND t1.del=false AND t2.del=false"
         )
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
-        val integer: Long = userMapper!!.selectCount(wrapper)
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
+        userMapper!!.selectCount(wrapper)
 
         ThreadLocalUtils.set("SELECT COUNT( * ) FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) LEFT JOIN area t2 ON (t2.id = t1.area_id) WHERE t.del=false AND t1.del=false AND t2.del=false")
         val wrapper1: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
-        val aLong1: Long = userMapper.selectJoinCount(wrapper1)
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
+        userMapper.selectJoinCount(wrapper1)
     }
 
 
@@ -809,17 +810,17 @@ class LambdaWrapperTest {
     fun testTable() {
         ThreadLocalUtils.set("SELECT t.id FROM `user`bbbbbbb t LEFT JOIN addressaaaaaaaaaa t1 ON (t1.user_id = t.id) LEFT JOIN area t2 ON (t2.id = t1.area_id) WHERE t.del=false AND t1.del=false AND t2.del=false AND (t.id <= ?) ORDER BY t.id DESC")
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .select(UserDO::id)
-            .leftJoin(AddressDO::class.java) { on ->
-                on.eq(AddressDO::userId, UserDO::id)
-                    .setTableName { name -> name + "aaaaaaaaaa" }
-            }
-            .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
-            .le(UserDO::id, 10000)
-            .orderByDesc(UserDO::id)
-            .setTableName { name -> name + "bbbbbbb" }
+                .select(UserDO::id)
+                .leftJoin(AddressDO::class.java) { on ->
+                    on.eq(AddressDO::userId, UserDO::id)
+                            .setTableName { name -> name + "aaaaaaaaaa" }
+                }
+                .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
+                .le(UserDO::id, 10000)
+                .orderByDesc(UserDO::id)
+                .setTableName { name -> name + "bbbbbbb" }
         try {
-            val list = userMapper!!.selectJoinList(UserDTO::class.java, wrapper)
+            userMapper!!.selectJoinList(UserDTO::class.java, wrapper)
         } catch (_: BadSqlGrammarException) {
         }
     }
@@ -831,47 +832,47 @@ class LambdaWrapperTest {
     @Test
     fun logicDelType() {
         ThreadLocalUtils.set(
-            "SELECT t.id,\n" +
-                    "       t.pid,\n" +
-                    "       t.`name`,\n" +
-                    "       t.`json`,\n" +
-                    "       t.sex,\n" +
-                    "       t.head_img,\n" +
-                    "       t.create_time,\n" +
-                    "       t.address_id,\n" +
-                    "       t.address_id2,\n" +
-                    "       t.del,\n" +
-                    "       t.create_by,\n" +
-                    "       t.update_by,\n" +
-                    "       t1.id  AS joina_id,\n" +
-                    "       t1.user_id,\n" +
-                    "       t1.area_id,\n" +
-                    "       t1.tel,\n" +
-                    "       t1.address,\n" +
-                    "       t1.del AS joina_del,\n" +
-                    "       t2.id  AS joinb_id,\n" +
-                    "       t2.province,\n" +
-                    "       t2.city,\n" +
-                    "       t2.area,\n" +
-                    "       t2.postcode,\n" +
-                    "       t2.del AS joinb_del\n" +
-                    "FROM `user` t\n" +
-                    "         LEFT JOIN address t1 ON (t1.user_id = t.id AND t1.del = false)\n" +
-                    "         LEFT JOIN area t2 ON (t2.id = t1.area_id AND t2.del = false)\n" +
-                    "WHERE t.del = false\n" +
-                    "  AND (t.id <= ?)\n" +
-                    "ORDER BY t.id DESC\n"
+                "SELECT t.id,\n" +
+                        "       t.pid,\n" +
+                        "       t.`name`,\n" +
+                        "       t.`json`,\n" +
+                        "       t.sex,\n" +
+                        "       t.head_img,\n" +
+                        "       t.create_time,\n" +
+                        "       t.address_id,\n" +
+                        "       t.address_id2,\n" +
+                        "       t.del,\n" +
+                        "       t.create_by,\n" +
+                        "       t.update_by,\n" +
+                        "       t1.id  AS joina_id,\n" +
+                        "       t1.user_id,\n" +
+                        "       t1.area_id,\n" +
+                        "       t1.tel,\n" +
+                        "       t1.address,\n" +
+                        "       t1.del AS joina_del,\n" +
+                        "       t2.id  AS joinb_id,\n" +
+                        "       t2.province,\n" +
+                        "       t2.city,\n" +
+                        "       t2.area,\n" +
+                        "       t2.postcode,\n" +
+                        "       t2.del AS joinb_del\n" +
+                        "FROM `user` t\n" +
+                        "         LEFT JOIN address t1 ON (t1.user_id = t.id AND t1.del = false)\n" +
+                        "         LEFT JOIN area t2 ON (t2.id = t1.area_id AND t2.del = false)\n" +
+                        "WHERE t.del = false\n" +
+                        "  AND (t.id <= ?)\n" +
+                        "ORDER BY t.id DESC\n"
         )
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .logicDelToOn()
-            .selectAll(UserDO::class.java)
-            .selectCollection(AddressDO::class.java, UserDTO::addressList) { addr ->
-                addr.association(AreaDO::class.java, AddressDTO::area)
-            }
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
-            .le(UserDO::id, 10000)
-            .orderByDesc(UserDO::id)
+                .logicDelToOn()
+                .selectAll(UserDO::class.java)
+                .selectCollection(AddressDO::class.java, UserDTO::addressList) { addr ->
+                    addr.association(AreaDO::class.java, AddressDTO::area)
+                }
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
+                .le(UserDO::id, 10000)
+                .orderByDesc(UserDO::id)
         println(wrapper.from)
         val list = userMapper!!.selectJoinList(UserDTO::class.java, wrapper)
 
@@ -885,47 +886,47 @@ class LambdaWrapperTest {
     @Test
     fun joinWrapper() {
         ThreadLocalUtils.set(
-            "SELECT t.id,\n" +
-                    "       t.pid,\n" +
-                    "       t.`name`,\n" +
-                    "       t.`json`,\n" +
-                    "       t.sex,\n" +
-                    "       t.head_img,\n" +
-                    "       t.create_time,\n" +
-                    "       t.address_id,\n" +
-                    "       t.address_id2,\n" +
-                    "       t.del,\n" +
-                    "       t.create_by,\n" +
-                    "       t.update_by,\n" +
-                    "       t1.id  AS joina_id,\n" +
-                    "       t1.user_id,\n" +
-                    "       t1.area_id,\n" +
-                    "       t1.tel,\n" +
-                    "       t1.address,\n" +
-                    "       t1.del AS joina_del,\n" +
-                    "       t2.id  AS joinb_id,\n" +
-                    "       t2.province,\n" +
-                    "       t2.city,\n" +
-                    "       t2.area,\n" +
-                    "       t2.postcode,\n" +
-                    "       t2.del AS joinb_del\n" +
-                    "FROM `user` t\n" +
-                    "         LEFT JOIN address t1 ON (t1.user_id = t.id AND t1.del = false)\n" +
-                    "         LEFT JOIN area t2 ON (t2.id = t1.area_id AND t2.del = false)\n" +
-                    "WHERE t.del = false\n" +
-                    "  AND (t.id <= ?)\n" +
-                    "ORDER BY t.id DESC\n"
+                "SELECT t.id,\n" +
+                        "       t.pid,\n" +
+                        "       t.`name`,\n" +
+                        "       t.`json`,\n" +
+                        "       t.sex,\n" +
+                        "       t.head_img,\n" +
+                        "       t.create_time,\n" +
+                        "       t.address_id,\n" +
+                        "       t.address_id2,\n" +
+                        "       t.del,\n" +
+                        "       t.create_by,\n" +
+                        "       t.update_by,\n" +
+                        "       t1.id  AS joina_id,\n" +
+                        "       t1.user_id,\n" +
+                        "       t1.area_id,\n" +
+                        "       t1.tel,\n" +
+                        "       t1.address,\n" +
+                        "       t1.del AS joina_del,\n" +
+                        "       t2.id  AS joinb_id,\n" +
+                        "       t2.province,\n" +
+                        "       t2.city,\n" +
+                        "       t2.area,\n" +
+                        "       t2.postcode,\n" +
+                        "       t2.del AS joinb_del\n" +
+                        "FROM `user` t\n" +
+                        "         LEFT JOIN address t1 ON (t1.user_id = t.id AND t1.del = false)\n" +
+                        "         LEFT JOIN area t2 ON (t2.id = t1.area_id AND t2.del = false)\n" +
+                        "WHERE t.del = false\n" +
+                        "  AND (t.id <= ?)\n" +
+                        "ORDER BY t.id DESC\n"
         )
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .logicDelToOn()
-            .selectAll(UserDO::class.java)
-            .selectCollection(AddressDO::class.java, UserDTO::addressList) { addr ->
-                addr.association(AreaDO::class.java, AddressDTO::area)
-            }
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
-            .le(UserDO::id, 10000)
-            .orderByDesc(UserDO::id)
+                .logicDelToOn()
+                .selectAll(UserDO::class.java)
+                .selectCollection(AddressDO::class.java, UserDTO::addressList) { addr ->
+                    addr.association(AreaDO::class.java, AddressDTO::area)
+                }
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
+                .le(UserDO::id, 10000)
+                .orderByDesc(UserDO::id)
 
         val list = wrapper.list(UserDTO::class.java)
 
@@ -937,20 +938,20 @@ class LambdaWrapperTest {
     @Test
     fun joinRandomMap() {
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .logicDelToOn()
-            .selectAll(UserDO::class.java)
-            .selectCollection(UserDTO::addressList) { addr ->
-                addr.id(AddressDO::id, AddressDTO::id)
-                    .result(UserDO::name, AddressDTO::address)
-                    .collection(AddressDTO::areaList) { map ->
-                        map.id(AreaDO::id)
-                            .result(AreaDO::area, AreaDO::area)
-                    }
-            }
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
-            .le(UserDO::id, 10000)
-            .orderByDesc(UserDO::id)
+                .logicDelToOn()
+                .selectAll(UserDO::class.java)
+                .selectCollection(UserDTO::addressList) { addr ->
+                    addr.id(AddressDO::id, AddressDTO::id)
+                            .result(UserDO::name, AddressDTO::address)
+                            .collection(AddressDTO::areaList) { map ->
+                                map.id(AreaDO::id)
+                                        .result(AreaDO::area, AreaDO::area)
+                            }
+                }
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
+                .le(UserDO::id, 10000)
+                .orderByDesc(UserDO::id)
 
         val list: MutableList<UserDTO> = wrapper.list(UserDTO::class.java)
         println(list)
@@ -962,11 +963,11 @@ class LambdaWrapperTest {
     fun joinRandomMap111() {
         ThreadLocalUtils.set("SELECT t.id,t.user_id,t.area_id,t.tel,t.address,t.del FROM address t LEFT JOIN `user` t1 ON (t1.address_id = t.id) LEFT JOIN `user` t2 ON (t2.pid = t1.id) WHERE t.del=false AND t1.del=false AND t2.del=false")
         val wrapper: KtLambdaWrapper<AddressDO> = KtWrappers.query(AddressDO::class.java)
-            .selectAll(AddressDO::class.java)
-            .leftJoin(UserDO::class.java, UserDO::addressId, AddressDO::id)
-            .leftJoin(UserDO::class.java, UserDO::pid, UserDO::id)
+                .selectAll(AddressDO::class.java)
+                .leftJoin(UserDO::class.java, UserDO::addressId, AddressDO::id)
+                .leftJoin(UserDO::class.java, UserDO::pid, UserDO::id)
 
-        val addressDOS: List<AddressDO> = wrapper.list()
+        wrapper.list()
     }
 
     /**
@@ -976,11 +977,11 @@ class LambdaWrapperTest {
     fun joinOwn() {
         ThreadLocalUtils.set("SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t1.id = t1.id)")
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectAll(UserDO::class.java)
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .eq(AddressDO::id, AddressDO::id)
+                .selectAll(UserDO::class.java)
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .eq(AddressDO::id, AddressDO::id)
 
-        val addressDOS: List<UserDO> = wrapper.list()
+        wrapper.list()
     }
 
     /**
@@ -990,12 +991,12 @@ class LambdaWrapperTest {
     fun joinOwn1() {
         ThreadLocalUtils.set("SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t LEFT JOIN address aaa ON (aaa.user_id = t.id) WHERE t.del=false AND aaa.del=false AND (aaa.id = t.id AND aaa.id = aaa.id)")
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectAll(UserDO::class.java)
-            .leftJoin(AddressDO::class.java, "aaa", AddressDO::userId, UserDO::id) { ext ->
-                ext.eq(AddressDO::id, AddressDO::id)
-            }
-            .eq(AddressDO::id, AddressDO::id)
-        val addressDOS: List<UserDO> = wrapper.list()
+                .selectAll(UserDO::class.java)
+                .leftJoin(AddressDO::class.java, "aaa", AddressDO::userId, UserDO::id) { ext ->
+                    ext.eq(AddressDO::id, AddressDO::id)
+                }
+                .eq(AddressDO::id, AddressDO::id)
+        wrapper.list()
     }
 
     /**
@@ -1004,22 +1005,22 @@ class LambdaWrapperTest {
     @Test
     fun joinOrder() {
         ThreadLocalUtils.set(
-            "SELECT id,user_id,name FROM order_t t ORDER BY t.name DESC",
-            "SELECT id,user_id,name FROM order_t t ORDER BY t.name desc"
+                "SELECT id,user_id,name FROM order_t t ORDER BY t.name DESC",
+                "SELECT id,user_id,name FROM order_t t ORDER BY t.name desc"
         )
         val wrapper: KtLambdaWrapper<OrderDO> = KtWrappers.query(OrderDO::class.java)
-        val list: List<OrderDO> = wrapper.list()
+        wrapper.list()
 
         ThreadLocalUtils.set(
-            "SELECT t.id,t.user_id,t.name,t1.`name` AS userName FROM order_t t LEFT JOIN `user` t1 ON (t1.id = t.user_id) WHERE t1.del=false ORDER BY t.name DESC",
-            "SELECT t.id,t.user_id,t.name,t1.`name` AS userName FROM order_t t LEFT JOIN `user` t1 ON (t1.id = t.user_id) WHERE t1.del=false ORDER BY t.name desc"
+                "SELECT t.id,t.user_id,t.name,t1.`name` AS userName FROM order_t t LEFT JOIN `user` t1 ON (t1.id = t.user_id) WHERE t1.del=false ORDER BY t.name DESC",
+                "SELECT t.id,t.user_id,t.name,t1.`name` AS userName FROM order_t t LEFT JOIN `user` t1 ON (t1.id = t.user_id) WHERE t1.del=false ORDER BY t.name desc"
         )
         val w: KtLambdaWrapper<OrderDO> = KtWrappers.query(OrderDO::class.java)
-            .selectAll(OrderDO::class.java)
-            .selectAs(UserDO::name, OrderDO::userName)
-            .leftJoin(UserDO::class.java, UserDO::id, OrderDO::userId)
+                .selectAll(OrderDO::class.java)
+                .selectAs(UserDO::name, OrderDO::userName)
+                .leftJoin(UserDO::class.java, UserDO::id, OrderDO::userId)
         println(wrapper.from)
-        val l: List<OrderDO> = w.list()
+        w.list()
     }
 
     /**
@@ -1030,8 +1031,8 @@ class LambdaWrapperTest {
         //物理删除
         ThreadLocalUtils.set("DELETE t FROM order_t t LEFT JOIN user_dto t1 ON (t1.id = t.user_id) WHERE (t.id = ?)")
         val w: KtDeleteJoinWrapper<OrderDO> = KtWrappers.delete(OrderDO::class.java)
-            .leftJoin(UserDto::class.java, UserDto::id, OrderDO::userId)
-            .eq(OrderDO::id, 1)
+                .leftJoin(UserDto::class.java, UserDto::id, OrderDO::userId)
+                .eq(OrderDO::id, 1)
         try {
             orderMapper!!.deleteJoin(w)
         } catch (_: BadSqlGrammarException) {
@@ -1040,10 +1041,10 @@ class LambdaWrapperTest {
         //逻辑删除
         ThreadLocalUtils.set("UPDATE `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) LEFT JOIN area t2 ON (t2.id = t1.area_id) SET t.del=true ,t1.del=true,t2.del=true WHERE t.del=false AND t1.del=false AND t2.del=false AND (t.id = ?)")
         val wrapper: KtDeleteJoinWrapper<UserDO> = KtWrappers.delete(UserDO::class.java)
-            .deleteAll()
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
-            .eq(OrderDO::id, 1)
+                .deleteAll()
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .leftJoin(AreaDO::class.java, AreaDO::id, AddressDO::areaId)
+                .eq(OrderDO::id, 1)
         try {
             userMapper!!.deleteJoin(wrapper)
         } catch (_: BadSqlGrammarException) {
@@ -1068,14 +1069,14 @@ class LambdaWrapperTest {
 
         ThreadLocalUtils.set("UPDATE `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) SET t.update_by=?, t.`name`=?,t1.address=?,t1.tel=?,t1.address=?,t.`name`=?,t.update_by=?,t1.user_id=?,t1.area_id=?,t1.tel=?,t1.address=? WHERE t.del=false AND t1.del=false AND (t.id = ?)")
         val update: KtUpdateJoinWrapper<UserDO> = KtWrappers.update(UserDO::class.java)
-            .set(UserDO::name, "aaaaaa")
-            .set(AddressDO::address, "bbbbb")
-            .setUpdateEntity(address, user)
-            .setUpdateEntityAndNull(address1)
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .eq(OrderDO::id, 1)
+                .set(UserDO::name, "aaaaaa")
+                .set(AddressDO::address, "bbbbb")
+                .setUpdateEntity(address, user)
+                .setUpdateEntityAndNull(address1)
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .eq(OrderDO::id, 1)
         try {
-            val join = userMapper!!.updateJoin(user1, update)
+            userMapper!!.updateJoin(user1, update)
         } catch (_: BadSqlGrammarException) {
             //忽略异常 h2不支持连表删除
         }
@@ -1083,8 +1084,8 @@ class LambdaWrapperTest {
 
         ThreadLocalUtils.set("UPDATE `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) SET t.pid=?, t.`name`=?, t.`json`=?, t.sex=?, t.head_img=?, t.create_time=?, t.address_id=?, t.address_id2=?, t.create_by=?, t.update_by=? WHERE t.del=false AND t1.del=false AND (t.id = ?)")
         val update1: KtUpdateJoinWrapper<UserDO> = KtWrappers.update(UserDO::class.java)
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .eq(OrderDO::id, 1)
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .eq(OrderDO::id, 1)
         try {
             userMapper!!.updateJoinAndNull(UserDO(), update1)
         } catch (_: BadSqlGrammarException) {
@@ -1099,27 +1100,38 @@ class LambdaWrapperTest {
     fun sub() {
         ThreadLocalUtils.set("SELECT ( SELECT st.id FROM `user` st WHERE st.del=false AND (st.id = t.id) limit 1 ) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t.id <= ?)")
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectSub(
-                UserDO::class.java, { w ->
+                .selectSub(
+                        UserDO::class.java, { w ->
                     w.select(UserDO::id)
-                        .eq(UserDO::id, UserDO::id)
-                        .last("limit 1")
+                            .eq(UserDO::id, UserDO::id)
+                            .last("limit 1")
                 }, UserDO::id
-            )
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .le(UserDO::id, 100)
+                )
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .le(UserDO::id, 100)
         wrapper.list()
 
-        ThreadLocalUtils.set("SELECT ( SELECT st.id FROM address st WHERE st.del=false AND (st.id = t.id) limit 1 ) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t.id <= ?)")
+        ThreadLocalUtils.set("SELECT ( SELECT st.id FROM area st WHERE st.del=false AND (st.id = t1.id) limit 1 ) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t.id <= ?)")
         val wrapper1: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectSub(AddressDO::class.java, { w ->
-                w.select(AddressDO::id)
-                    .eq(AddressDO::id, UserDO::id)
-                    .last("limit 1")
-            }, UserDO::id)
-            .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-            .le(UserDO::id, 100)
+                .selectSub(AreaDO::class.java, { w ->
+                    w.select(AreaDO::id)
+                            .eq(AreaDO::id, AddressDO::id)
+                            .last("limit 1")
+                }, UserDO::id)
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .le(UserDO::id, 100)
         wrapper1.list()
+
+        ThreadLocalUtils.set("SELECT ( SELECT st.id FROM address st WHERE st.del=false AND (st.id = t1.id) limit 1 ) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t.id <= ?)")
+        val wrapper2: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
+                .selectSub(AddressDO::class.java, { w ->
+                    w.select(AddressDO::id)
+                            .eq(AddressDO::id, AddressDO::id)
+                            .last("limit 1")
+                }, UserDO::id)
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .le(UserDO::id, 100)
+        wrapper2.list()
     }
 
 
@@ -1129,14 +1141,14 @@ class LambdaWrapperTest {
     @Test
     fun union() {
         val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectAll(UserDO::class.java)
-            .eq(UserDO::id, 1)
+                .selectAll(UserDO::class.java)
+                .eq(UserDO::id, 1)
         val wrapper1: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectAll(UserDO::class.java)
-            .eq(UserDO::name, "张三 2")
+                .selectAll(UserDO::class.java)
+                .eq(UserDO::name, "张三 2")
         val wrapper2: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-            .selectAll(UserDO::class.java)
-            .eq(UserDO::pid, 2)
+                .selectAll(UserDO::class.java)
+                .eq(UserDO::pid, 2)
 
         wrapper.union(wrapper1, wrapper2)
         val list = wrapper.list()

From c60e89ea7991803847c37ab837474b7e61ef53f9 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 23 Oct 2023 00:28:13 +0800
Subject: [PATCH 02/88] =?UTF-8?q?fix=20select=E5=AD=90=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAPPING.md | 113 -----------------------------------------------------
 README.md  |   6 +--
 2 files changed, 3 insertions(+), 116 deletions(-)
 delete mode 100644 MAPPING.md

diff --git a/MAPPING.md b/MAPPING.md
deleted file mode 100644
index c3cb4b1..0000000
--- a/MAPPING.md
+++ /dev/null
@@ -1,113 +0,0 @@
-# mybatis-plus-join
-
-#### @EntityMapping 和 @FieldMapping 注解
-
-UserDO.java
-
-```java
-
-@Data
-@TableName("user")
-public class UserDO {
-
-    @TableId
-    private Integer id;
-    private Integer pid;//父id
-    /* 其他属性略 */
-
-    /**
-     * 查询上级 一对一
-     */
-    @TableField(exist = false)
-    @EntityMapping(thisField = "pid", joinField = "id")
-    private UserDO pUser;
-
-    /**
-     * 查询下级 一对多
-     */
-    @TableField(exist = false)
-    @EntityMapping(thisField = "id", joinField = "pid")
-    private List<UserDO> childUser;
-
-    /**
-     * 带条件的查询下级 一对多
-     */
-    @TableField(exist = false)
-    @EntityMapping(thisField = "id", joinField = "pid",
-            condition = {
-                    @MPJMappingCondition(column = "sex", value = "0"),//sex = '0' 默认条件是等于
-                    @MPJMappingCondition(column = "name", value = "张三", keyWord = SqlKeyword.LIKE)//name like '%a%'
-            },
-            apply = @MPJMappingApply(value = "id between 1 and 20"))//拼接sql 同 wrapper.apply()
-    private List<UserDO> childUserCondition;
-
-    /**
-     * 查询地址 (一对多)
-     */
-    @TableField(exist = false)
-    @EntityMapping(thisField = "id", joinField = "userId")
-    private List<UserAddressDO> addressList;
-
-    /**
-     * 绑定字段 （一对多）
-     */
-    @TableField(exist = false)
-    @FieldMapping(tag = UserDO.class, thisField = "id", joinField = "pid", select = "id")
-    private List<Integer> childIds;
-}
-```
-
-使用
-
-```java
-/**
- * 一对一，一对多关系映射查询
- * 如果不需要关系映射就使用mybatis plus原生方法即可，比如 getById listByIds 等
- * <p>
- * 注意：关系映射不会去关联查询，而是执行多次单表查询（对结果汇总后使用in语句查询,再对结果进行匹配）
- */
-@SpringBootTest
-class MappingTest {
-    @Resource
-    private UserMapper userMapper;
-
-    @Test
-    void test1() {
-        UserDO deep = userMapper.selectByIdDeep(2);
-        System.out.println(deep);
-    }
-
-    @Test
-    void test2() {
-        List<UserDO> list = userMapper.selectRelation(mapper -> mapper.selectList(Wrappers.emptyWrapper()));
-        list.forEach(System.out::println);
-    }
-
-    @Test
-    void test3() {
-        Page<UserDO> page = new Page<>(2, 2);
-        Page<UserDO> result = userMapper.selectRelation(mapper -> mapper.selectPage(page, Wrappers.emptyWrapper()));
-        result.getRecords().forEach(System.out::println);
-    }
-
-    /*
-      更多方法请查阅 MPJDeepMapper 或者 MPJDeepService
-      使用方式与 mybatis plus 一致
-     */
-}
-```
-
-MPJMapping 说明：
-
-* @EntityMapping / @FieldMapping tag 关联实体类
-* @EntityMapping / @FieldMapping thisField 当前类关联对应的字段的属性名，可以不填，默认为当前类的主键
-* @EntityMapping / @FieldMapping joinField 关联类对应的字段的属性名，可以不填，默认为关联类的主键
-* @EntityMapping / @FieldMapping isThrowExp 一对一查询时,如果查询到多条记录是否抛出异常,true:抛出异常,false:获取列表第一条数据
-*
-
-更多功能请看代码注释 [EntityMapping](https://gitee.com/best_handsome/mybatis-plus-join/blob/master/src/main/java/com/github/yulichang/annotation/EntityMapping.java)
-[FieldMapping](https://gitee.com/best_handsome/mybatis-plus-join/blob/master/src/main/java/com/github/yulichang/annotation/FieldMapping.java)
-
-
-
-
diff --git a/README.md b/README.md
index 0c401cc..3eae84e 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,9 @@
     <img alt="code style" src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square">
   </a>
 </p>
-<h1 align="center">mybatis-plus-join</h1>
+<h1 align="center">MyBatis-Plus-Join</h1>
 <p align="center">
-对 <a href="https://gitee.com/baomidou/mybatis-plus" target="_blank">mybatis-plus</a> 多表查询的扩展 |
+对 <a href="https://gitee.com/baomidou/mybatis-plus" target="_blank">MyBatis-Plus</a> 多表查询的扩展 |
 <a href="https://gitee.com/best_handsome/mybatis-plus-join-demo" target="_blank">演示工程</a> |
 <a href="https://www.baidu.com/link?url=wdmhssysW-Mj19Gkcc2CBOzNVoimHat57mlnH78SEU_6y0awYgDKTBy7es9BXnAH&wd=&eqid=908484020001866e000000056440b5e3" target="_blank">使用文档</a> |
 点个Star支持一下吧 (☆▽☆)
@@ -59,7 +59,7 @@ QQ群:1022221898  或者
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
-  注意: mybatis plus version >= 3.3.0
+  注意: MyBatis Plus版本需要3.3.0+
   <br>
 
 ### 使用

From 1ce8f68f299e00af6cc8ed41675298aa2d72eea4 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 23 Oct 2023 15:20:49 +0800
Subject: [PATCH 03/88] =?UTF-8?q?MP=E5=8D=87=E7=BA=A73.5.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis-plus-join-adapter-base/pom.xml    |  8 +++-
 .../adapter/base/ITableInfoAdapter.java       | 32 +++++++++++++---
 .../adapter/base/metadata/OrderFieldInfo.java | 35 +++++++++++++++++
 .../adapter/base/tookit}/VersionUtils.java    |  2 +-
 .../adapter/v33x/TableInfoAdapterV33x.java    | 13 ++++++-
 .../adapter/v3431/TableInfoAdapter3431.java   | 25 ++++++++++++
 mybatis-plus-join-boot-starter/pom.xml        |  2 +-
 mybatis-plus-join-core/pom.xml                |  2 +-
 .../yulichang/adapter/AdapterHelper.java      | 12 ++++--
 .../yulichang/adapter/TableInfoAdapter.java   | 35 -----------------
 .../yulichang/injector/MPJSqlInjector.java    |  4 +-
 .../yulichang/interceptor/MPJInterceptor.java | 11 +++---
 .../yulichang/method/MPJBaseMethod.java       | 15 +++-----
 .../github/yulichang/toolkit/LambdaUtils.java |  6 ++-
 .../yulichang/toolkit/ReflectionKit.java      | 33 +++++-----------
 .../toolkit/support/IdeaProxyLambdaMeta.java  | 38 ++++---------------
 .../toolkit/support/ReflectLambdaMeta.java    | 36 +++---------------
 mybatis-plus-join-extension/pom.xml           |  2 +-
 .../mapping/mapper/MPJTableFieldInfo.java     | 25 +++++++-----
 .../test/join/LambdaWrapperTest.java          | 20 ++++++++--
 20 files changed, 190 insertions(+), 166 deletions(-)
 create mode 100644 mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/metadata/OrderFieldInfo.java
 rename {mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit => mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/tookit}/VersionUtils.java (96%)
 create mode 100644 mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/TableInfoAdapter3431.java

diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
index 07ecad3..c685062 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
@@ -46,7 +46,13 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.5.3.2</version>
+            <version>3.5.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.28</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/ITableInfoAdapter.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/ITableInfoAdapter.java
index 1614f55..6a8e90d 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/ITableInfoAdapter.java
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/ITableInfoAdapter.java
@@ -2,10 +2,13 @@ package com.github.yulichang.adapter.base;
 
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.github.yulichang.adapter.base.metadata.OrderFieldInfo;
 import org.apache.ibatis.session.Configuration;
 
 import java.lang.reflect.Field;
+import java.util.List;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 /**
  * @author yulichang
@@ -13,15 +16,32 @@ import java.util.function.Supplier;
  */
 public interface ITableInfoAdapter {
 
-    boolean mpjHasLogic(TableInfo tableInfo);
+    default boolean mpjHasLogic(TableInfo tableInfo) {
+        return tableInfo.isWithLogicDelete();
+    }
 
-    boolean mpjIsPrimitive(TableFieldInfo tableFieldInfo);
+    default boolean mpjIsPrimitive(TableFieldInfo tableFieldInfo) {
+        return tableFieldInfo.isPrimitive();
+    }
 
-    TableFieldInfo mpjGetLogicField(TableInfo tableInfo);
+    default TableFieldInfo mpjGetLogicField(TableInfo tableInfo) {
+        return tableInfo.getLogicDeleteFieldInfo();
+    }
 
-    boolean mpjHasPK(TableInfo tableInfo);
+    default boolean mpjHasPK(TableInfo tableInfo) {
+        return tableInfo.havePK();
+    }
 
-    Configuration mpjGetConfiguration(TableInfo tableInfo);
+    default Configuration mpjGetConfiguration(TableInfo tableInfo) {
+        return tableInfo.getConfiguration();
+    }
 
-    Field mpjGetField(TableFieldInfo fieldInfo, Supplier<Field> supplier);
+    default Field mpjGetField(TableFieldInfo fieldInfo, Supplier<Field> supplier) {
+        return fieldInfo.getField();
+    }
+
+    default List<OrderFieldInfo> mpjGetOrderField(TableInfo tableInfo) {
+        return tableInfo.getOrderByFields().stream().map(f ->
+                new OrderFieldInfo(f.getColumn(), f.getType(), f.getSort())).collect(Collectors.toList());
+    }
 }
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/metadata/OrderFieldInfo.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/metadata/OrderFieldInfo.java
new file mode 100644
index 0000000..a73c045
--- /dev/null
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/metadata/OrderFieldInfo.java
@@ -0,0 +1,35 @@
+package com.github.yulichang.adapter.base.metadata;
+
+import lombok.Data;
+
+/**
+ * 兼容MP 3.5.4
+ * copy {@link com.baomidou.mybatisplus.core.metadata.OrderFieldInfo}
+ *
+ * @since 1.4.7
+ */
+@Data
+public class OrderFieldInfo {
+
+    /**
+     * 字段
+     */
+    private String column;
+
+    /**
+     * 排序类型
+     */
+    private String type;
+
+    /**
+     * 排序顺序
+     */
+    private short sort;
+
+
+    public OrderFieldInfo(String column, String type, short orderBySort) {
+        this.column = column;
+        this.type = type;
+        this.sort = orderBySort;
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/VersionUtils.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/tookit/VersionUtils.java
similarity index 96%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/VersionUtils.java
rename to mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/tookit/VersionUtils.java
index a692bfd..6a38ff7 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/VersionUtils.java
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/tookit/VersionUtils.java
@@ -1,4 +1,4 @@
-package com.github.yulichang.toolkit;
+package com.github.yulichang.adapter.base.tookit;
 
 /**
  * 版本工具类
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/TableInfoAdapterV33x.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/TableInfoAdapterV33x.java
index 73dc984..9aefe80 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/TableInfoAdapterV33x.java
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/TableInfoAdapterV33x.java
@@ -1,12 +1,16 @@
 package com.github.yulichang.adapter.v33x;
 
+import com.baomidou.mybatisplus.core.MybatisPlusVersion;
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.yulichang.adapter.base.ITableInfoAdapter;
+import com.github.yulichang.adapter.base.metadata.OrderFieldInfo;
+import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import org.apache.ibatis.session.Configuration;
 
 import java.lang.reflect.Field;
+import java.util.List;
 import java.util.Objects;
 import java.util.function.Supplier;
 
@@ -16,6 +20,8 @@ import java.util.function.Supplier;
  */
 public class TableInfoAdapterV33x implements ITableInfoAdapter {
 
+    private static final boolean is330 = VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.3.0") == 0;
+
     @Override
     public boolean mpjHasLogic(TableInfo tableInfo) {
         return tableInfo.isLogicDelete();
@@ -45,6 +51,11 @@ public class TableInfoAdapterV33x implements ITableInfoAdapter {
 
     @Override
     public Field mpjGetField(TableFieldInfo fieldInfo, Supplier<Field> supplier) {
-        return supplier.get();
+        return is330 ? supplier.get() : ITableInfoAdapter.super.mpjGetField(fieldInfo, null);
+    }
+
+    @Override
+    public List<OrderFieldInfo> mpjGetOrderField(TableInfo tableInfo) {
+        throw new UnsupportedOperationException("不支持排序");
     }
 }
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/TableInfoAdapter3431.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/TableInfoAdapter3431.java
new file mode 100644
index 0000000..eaf1081
--- /dev/null
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/TableInfoAdapter3431.java
@@ -0,0 +1,25 @@
+package com.github.yulichang.adapter.v3431;
+
+import com.baomidou.mybatisplus.core.MybatisPlusVersion;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.github.yulichang.adapter.base.ITableInfoAdapter;
+import com.github.yulichang.adapter.base.metadata.OrderFieldInfo;
+import com.github.yulichang.adapter.base.tookit.VersionUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author yulichang
+ * @since 1.4.7
+ */
+public class TableInfoAdapter3431 implements ITableInfoAdapter {
+
+    private static final boolean v = VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.4.3") < 0;
+
+    @Override
+    public List<OrderFieldInfo> mpjGetOrderField(TableInfo tableInfo) {
+        return v ? null : tableInfo.getOrderByFields().stream().map(f ->
+                new OrderFieldInfo(f.getColumn(), f.getOrderByType(), f.getOrderBySort())).collect(Collectors.toList());
+    }
+}
diff --git a/mybatis-plus-join-boot-starter/pom.xml b/mybatis-plus-join-boot-starter/pom.xml
index 6e177a0..dfd6c0a 100644
--- a/mybatis-plus-join-boot-starter/pom.xml
+++ b/mybatis-plus-join-boot-starter/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.3.2</version>
+            <version>3.5.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/mybatis-plus-join-core/pom.xml b/mybatis-plus-join-core/pom.xml
index 3d59ec3..19c687f 100644
--- a/mybatis-plus-join-core/pom.xml
+++ b/mybatis-plus-join-core/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.5.3.2</version>
+            <version>3.5.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java
index 09ca2a8..3b91ccf 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java
@@ -1,9 +1,11 @@
 package com.github.yulichang.adapter;
 
 import com.baomidou.mybatisplus.core.MybatisPlusVersion;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.github.yulichang.adapter.base.ITableInfoAdapter;
+import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.adapter.v33x.TableInfoAdapterV33x;
+import com.github.yulichang.adapter.v3431.TableInfoAdapter3431;
 
 /**
  * @author yulichang
@@ -15,10 +17,14 @@ public class AdapterHelper {
 
     static {
         String version = MybatisPlusVersion.getVersion();
-        if (StringUtils.isNotBlank(version) && version.startsWith("3.3.")) {
+        if (VersionUtils.compare(version, "3.5.4") >= 0) {
+            adapter = new TableInfoAdapter();
+        } else if (VersionUtils.compare(version, "3.4.0") >= 0) {
+            adapter = new TableInfoAdapter3431();
+        } else if (VersionUtils.compare(version, "3.3.0") >= 0) {
             adapter = new TableInfoAdapterV33x();
         } else {
-            adapter = new TableInfoAdapter();
+            throw ExceptionUtils.mpe("MPJ需要MP版本3.3.0+，当前MP版本%s", version);
         }
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/TableInfoAdapter.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/TableInfoAdapter.java
index 1b6ae41..145a51c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/TableInfoAdapter.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/TableInfoAdapter.java
@@ -1,12 +1,6 @@
 package com.github.yulichang.adapter;
 
-import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
-import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.github.yulichang.adapter.base.ITableInfoAdapter;
-import org.apache.ibatis.session.Configuration;
-
-import java.lang.reflect.Field;
-import java.util.function.Supplier;
 
 /**
  * @author yulichang
@@ -14,33 +8,4 @@ import java.util.function.Supplier;
  */
 public class TableInfoAdapter implements ITableInfoAdapter {
 
-    @Override
-    public boolean mpjHasLogic(TableInfo tableInfo) {
-        return tableInfo.isWithLogicDelete();
-    }
-
-    @Override
-    public boolean mpjIsPrimitive(TableFieldInfo tableFieldInfo) {
-        return tableFieldInfo.isPrimitive();
-    }
-
-    @Override
-    public TableFieldInfo mpjGetLogicField(TableInfo tableInfo) {
-        return tableInfo.getLogicDeleteFieldInfo();
-    }
-
-    @Override
-    public boolean mpjHasPK(TableInfo tableInfo) {
-        return tableInfo.havePK();
-    }
-
-    @Override
-    public Configuration mpjGetConfiguration(TableInfo tableInfo) {
-        return tableInfo.getConfiguration();
-    }
-
-    @Override
-    public Field mpjGetField(TableFieldInfo fieldInfo, Supplier<Field> supplier) {
-        return fieldInfo.getField();
-    }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java
index 8bd84a2..b51e61c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java
@@ -15,7 +15,7 @@ import com.github.yulichang.adapter.v3431.AbstractMethodV3431;
 import com.github.yulichang.method.*;
 import com.github.yulichang.toolkit.MPJTableMapperHelper;
 import com.github.yulichang.toolkit.TableHelper;
-import com.github.yulichang.toolkit.VersionUtils;
+import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.toolkit.reflect.GenericTypeUtils;
 import lombok.Getter;
 import org.apache.ibatis.builder.MapperBuilderAssistant;
@@ -38,9 +38,9 @@ import static java.util.stream.Collectors.toList;
  * @author yulichang
  * @see DefaultSqlInjector
  */
+@Getter
 public class MPJSqlInjector extends DefaultSqlInjector {
 
-    @Getter
     private AbstractSqlInjector sqlInjector;
 
     public MPJSqlInjector() {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
index a5d881e..3eec2ec 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
@@ -1,14 +1,14 @@
 package com.github.yulichang.interceptor;
 
+import com.baomidou.mybatisplus.core.MybatisPlusVersion;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 import com.baomidou.mybatisplus.core.toolkit.*;
+import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.method.MPJResultType;
 import com.github.yulichang.query.MPJQueryWrapper;
-import com.github.yulichang.toolkit.Constant;
-import com.github.yulichang.toolkit.MPJReflectionKit;
-import com.github.yulichang.toolkit.MPJTableMapperHelper;
-import com.github.yulichang.toolkit.TableHelper;
+import com.github.yulichang.toolkit.*;
 import com.github.yulichang.toolkit.support.FieldCache;
 import com.github.yulichang.wrapper.interfaces.SelectWrapper;
 import com.github.yulichang.wrapper.resultmap.IResult;
@@ -41,6 +41,7 @@ import java.util.concurrent.ConcurrentHashMap;
 @Intercepts(@Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class}))
 public class MPJInterceptor implements Interceptor {
 
+    private static final boolean v = VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.4.3.1") > 0;
 
     private static final List<ResultMapping> EMPTY_RESULT_MAPPING = new ArrayList<>(0);
 
@@ -286,7 +287,7 @@ public class MPJInterceptor implements Interceptor {
             childId.append("]");
         }
         //双检
-        String id = childId.toString();
+        String id = v ? childId.toString() : childId.toString().replaceAll("\\.", "~");
         if (!ms.getConfiguration().hasResultMap(id)) {
             ResultMap build = new ResultMap.Builder(ms.getConfiguration(), id, mybatisLabel.getOfType(), childMapping).build();
             MPJInterceptor.addResultMap(ms, id, build);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java
index 1b4eb67..c3c475e 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java
@@ -1,7 +1,6 @@
 package com.github.yulichang.method;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.core.MybatisPlusVersion;
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -10,9 +9,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
 import com.github.yulichang.adapter.AdapterHelper;
+import com.github.yulichang.adapter.base.metadata.OrderFieldInfo;
 import com.github.yulichang.annotation.DynamicTableName;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.toolkit.VersionUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -72,23 +71,19 @@ public interface MPJBaseMethod extends Constants {
      */
     default String mpjSqlOrderBy(TableInfo tableInfo) {
         /* 不存在排序字段，直接返回空 */
-        List<TableFieldInfo> orderByFields;
+        List<OrderFieldInfo> orderByFields;
         try {
-            if (VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.4.3") >= 0) {
-                orderByFields = tableInfo.getOrderByFields();
-            } else {
-                return StringPool.EMPTY;
-            }
+            orderByFields = AdapterHelper.getTableInfoAdapter().mpjGetOrderField(tableInfo);
         } catch (Exception e) {
             return StringPool.EMPTY;
         }
         if (CollectionUtils.isEmpty(orderByFields)) {
             return StringPool.EMPTY;
         }
-        orderByFields.sort(Comparator.comparingInt(TableFieldInfo::getOrderBySort));
+        orderByFields.sort(Comparator.comparingInt(OrderFieldInfo::getSort));
         String sql = NEWLINE + " ORDER BY " +
                 orderByFields.stream().map(tfi -> String.format("${ew.alias}.%s %s", tfi.getColumn(),
-                        tfi.getOrderByType())).collect(joining(","));
+                        tfi.getType())).collect(joining(","));
         /* 当wrapper中传递了orderBy属性，@orderBy注解失效 */
         return SqlScriptUtils.convertIf(sql, String.format("%s == null or %s", WRAPPER,
                 WRAPPER_EXPRESSION_ORDER), true);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LambdaUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LambdaUtils.java
index b1f9d53..4d12ebe 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LambdaUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LambdaUtils.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.toolkit.support.*;
 import org.apache.ibatis.reflection.property.PropertyNamer;
 
+import java.lang.invoke.SerializedLambda;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.Map;
@@ -50,10 +51,11 @@ public final class LambdaUtils {
         // 2. 反射读取
         try {
             Method method = func.getClass().getDeclaredMethod("writeReplace");
-            return new ReflectLambdaMeta((java.lang.invoke.SerializedLambda) ReflectionKit.setAccessible(method).invoke(func));
+            method.setAccessible(true);
+            return new ReflectLambdaMeta((SerializedLambda) method.invoke(func), func.getClass().getClassLoader());
         } catch (Throwable e) {
             // 3. 反射失败使用序列化的方式读取
-            return new ShadowLambdaMeta(SerializedLambda.extract(func));
+            return new ShadowLambdaMeta(com.github.yulichang.toolkit.support.SerializedLambda.extract(func));
         }
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/ReflectionKit.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/ReflectionKit.java
index 96603a2..8cbc3ed 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/ReflectionKit.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/ReflectionKit.java
@@ -20,10 +20,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.github.yulichang.toolkit.reflect.GenericTypeUtils;
 
-import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.security.AccessController;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
@@ -142,11 +140,11 @@ public final class ReflectionKit {
              * 中间表实体重写父类属性 ` private transient Date createTime; `
              */
             return fieldMap.values().stream()
-                /* 过滤静态属性 */
-                .filter(f -> !Modifier.isStatic(f.getModifiers()))
-                /* 过滤 transient关键字修饰的属性 */
-                .filter(f -> !Modifier.isTransient(f.getModifiers()))
-                .collect(Collectors.toList());
+                    /* 过滤静态属性 */
+                    .filter(f -> !Modifier.isStatic(f.getModifiers()))
+                    /* 过滤 transient关键字修饰的属性 */
+                    .filter(f -> !Modifier.isTransient(f.getModifiers()))
+                    .collect(Collectors.toList());
         });
     }
 
@@ -161,12 +159,12 @@ public final class ReflectionKit {
     public static Map<String, Field> excludeOverrideSuperField(Field[] fields, List<Field> superFieldList) {
         // 子类属性
         Map<String, Field> fieldMap = Stream.of(fields).collect(toMap(Field::getName, identity(),
-            (u, v) -> {
-                throw new IllegalStateException(String.format("Duplicate key %s", u));
-            },
-            LinkedHashMap::new));
+                (u, v) -> {
+                    throw new IllegalStateException(String.format("Duplicate key %s", u));
+                },
+                LinkedHashMap::new));
         superFieldList.stream().filter(field -> !fieldMap.containsKey(field.getName()))
-            .forEach(f -> fieldMap.put(f.getName(), f));
+                .forEach(f -> fieldMap.put(f.getName(), f));
         return fieldMap;
     }
 
@@ -186,17 +184,6 @@ public final class ReflectionKit {
         return (clazz.isPrimitive() && clazz != void.class ? PRIMITIVE_TYPE_TO_WRAPPER_MAP.get(clazz) : clazz);
     }
 
-    /**
-     * 设置可访问对象的可访问权限为 true
-     *
-     * @param object 可访问的对象
-     * @param <T>    类型
-     * @return 返回设置后的对象
-     */
-    public static <T extends AccessibleObject> T setAccessible(T object) {
-        return AccessController.doPrivileged(new SetAccessibleAction<>(object));
-    }
-
     public static <K, V> V computeIfAbsent(Map<K, V> concurrentHashMap, K key, Function<? super K, ? extends V> mappingFunction) {
         V v = concurrentHashMap.get(key);
         if (v != null) {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/IdeaProxyLambdaMeta.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/IdeaProxyLambdaMeta.java
index a4c3482..103d6b0 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/IdeaProxyLambdaMeta.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/IdeaProxyLambdaMeta.java
@@ -15,11 +15,10 @@
  */
 package com.github.yulichang.toolkit.support;
 
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandleProxies;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Executable;
 import java.lang.reflect.Proxy;
 
 /**
@@ -28,35 +27,14 @@ import java.lang.reflect.Proxy;
  * Create by hcl at 2021/5/17
  */
 public class IdeaProxyLambdaMeta implements LambdaMeta {
-    private static final Field FIELD_MEMBER_NAME;
-    private static final Field FIELD_MEMBER_NAME_CLAZZ;
-    private static final Field FIELD_MEMBER_NAME_NAME;
-
-    static {
-        try {
-            Class<?> classDirectMethodHandle = Class.forName("java.lang.invoke.DirectMethodHandle");
-            FIELD_MEMBER_NAME = ReflectionKit.setAccessible(classDirectMethodHandle.getDeclaredField("member"));
-            Class<?> classMemberName = Class.forName("java.lang.invoke.MemberName");
-            FIELD_MEMBER_NAME_CLAZZ = ReflectionKit.setAccessible(classMemberName.getDeclaredField("clazz"));
-            FIELD_MEMBER_NAME_NAME = ReflectionKit.setAccessible(classMemberName.getDeclaredField("name"));
-        } catch (ClassNotFoundException | NoSuchFieldException e) {
-            throw new MybatisPlusException(e);
-        }
-    }
-
     private final Class<?> clazz;
     private final String name;
 
     public IdeaProxyLambdaMeta(Proxy func) {
-        InvocationHandler handler = Proxy.getInvocationHandler(func);
-        try {
-            Object dmh = ReflectionKit.setAccessible(handler.getClass().getDeclaredField("val$target")).get(handler);
-            Object member = FIELD_MEMBER_NAME.get(dmh);
-            clazz = (Class<?>) FIELD_MEMBER_NAME_CLAZZ.get(member);
-            name = (String) FIELD_MEMBER_NAME_NAME.get(member);
-        } catch (IllegalAccessException | NoSuchFieldException e) {
-            throw new MybatisPlusException(e);
-        }
+        MethodHandle dmh = MethodHandleProxies.wrapperInstanceTarget(func);
+        Executable executable = MethodHandles.reflectAs(Executable.class, dmh);
+        clazz = executable.getDeclaringClass();
+        name = executable.getName();
     }
 
     @Override
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ReflectLambdaMeta.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ReflectLambdaMeta.java
index a37c03c..74fbb6c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ReflectLambdaMeta.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ReflectLambdaMeta.java
@@ -16,36 +16,22 @@
 package com.github.yulichang.toolkit.support;
 
 
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.github.yulichang.toolkit.ClassUtils;
-import com.github.yulichang.toolkit.ReflectionKit;
 
 import java.lang.invoke.SerializedLambda;
-import java.lang.reflect.Field;
 
 /**
  * Created by hcl at 2021/5/14
  */
 public class ReflectLambdaMeta implements LambdaMeta {
-    private static final Field FIELD_CAPTURING_CLASS;
-
-    static {
-        Field fieldCapturingClass;
-        try {
-            Class<SerializedLambda> aClass = SerializedLambda.class;
-            fieldCapturingClass = ReflectionKit.setAccessible(aClass.getDeclaredField("capturingClass"));
-        } catch (Throwable e) {
-            // 解决高版本 jdk 的问题 gitee: https://gitee.com/baomidou/mybatis-plus/issues/I4A7I5
-            fieldCapturingClass = null;
-        }
-        FIELD_CAPTURING_CLASS = fieldCapturingClass;
-    }
-
     private final SerializedLambda lambda;
 
-    public ReflectLambdaMeta(SerializedLambda lambda) {
+    private final ClassLoader classLoader;
+
+    public ReflectLambdaMeta(SerializedLambda lambda, ClassLoader classLoader) {
         this.lambda = lambda;
+        this.classLoader = classLoader;
     }
 
     @Override
@@ -57,19 +43,7 @@ public class ReflectLambdaMeta implements LambdaMeta {
     public Class<?> getInstantiatedClass() {
         String instantiatedMethodType = lambda.getInstantiatedMethodType();
         String instantiatedType = instantiatedMethodType.substring(2, instantiatedMethodType.indexOf(StringPool.SEMICOLON)).replace(StringPool.SLASH, StringPool.DOT);
-        return ClassUtils.toClassConfident(instantiatedType, getCapturingClassClassLoader());
-    }
-
-    private ClassLoader getCapturingClassClassLoader() {
-        // 如果反射失败，使用默认的 classloader
-        if (FIELD_CAPTURING_CLASS == null) {
-            return null;
-        }
-        try {
-            return ((Class<?>) FIELD_CAPTURING_CLASS.get(lambda)).getClassLoader();
-        } catch (IllegalAccessException e) {
-            throw new MybatisPlusException(e);
-        }
+        return ClassUtils.toClassConfident(instantiatedType, this.classLoader);
     }
 
 }
diff --git a/mybatis-plus-join-extension/pom.xml b/mybatis-plus-join-extension/pom.xml
index e60c1ad..1a462ce 100644
--- a/mybatis-plus-join-extension/pom.xml
+++ b/mybatis-plus-join-extension/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.5.3.2</version>
+            <version>3.5.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java
index 53a038a..dd757f2 100644
--- a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java
+++ b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
+import com.github.yulichang.adapter.AdapterHelper;
 import com.github.yulichang.annotation.EntityMapping;
 import com.github.yulichang.annotation.FieldMapping;
 import com.github.yulichang.toolkit.SpringContentUtils;
@@ -156,7 +157,7 @@ public class MPJTableFieldInfo {
         Assert.notNull(info, "未注册的实体类 <%s>", this.joinClass.getSimpleName());
         //根据属性名查询
         Field field = info.getFieldList().stream().filter(i -> i.getProperty().equals(bindName))
-                .findFirst().map(TableFieldInfo::getField).orElse(null);
+                .findFirst().map(f -> getField(this.joinClass, f)).orElse(null);
         if (field == null && bindName.equals(info.getKeyProperty())) {
             field = ReflectionKit.getFieldList(joinClass).stream().filter(f ->
                     f.getName().equals(info.getKeyProperty())).findFirst().orElse(null);
@@ -165,7 +166,7 @@ public class MPJTableFieldInfo {
             //根据字段查询
             field = info.getFieldList().stream()
                     .filter(i -> i.getColumn().equals(bindName))
-                    .map(TableFieldInfo::getField).findFirst().orElse(null);
+                    .map(f -> getField(this.joinClass, f)).findFirst().orElse(null);
             if (field == null && bindName.equals(info.getKeyColumn())) {
                 field = ReflectionKit.getFieldList(joinClass).stream().filter(f ->
                         f.getName().equals(info.getKeyProperty())).findFirst().orElse(null);
@@ -175,6 +176,7 @@ public class MPJTableFieldInfo {
             }
         }
         this.bindField = field;
+        this.bindField.setAccessible(true);
     }
 
     private void initJoinField(String joinField) {
@@ -188,16 +190,16 @@ public class MPJTableFieldInfo {
 
         TableInfo joinTableInfo = getTableInfo(this.joinClass);
         TableFieldInfo joinFieldInfo = joinTableInfo.getFieldList().stream().filter(f ->
-                f.getField().getName().equals(this.joinProperty)).findFirst().orElse(null);
+                f.getProperty().equals(this.joinProperty)).findFirst().orElse(null);
         if (joinFieldInfo == null) {
-            if (joinTableInfo.havePK() && this.joinProperty.equals(joinTableInfo.getKeyProperty())) {
+            if (AdapterHelper.getTableInfoAdapter().mpjHasPK(joinTableInfo) && this.joinProperty.equals(joinTableInfo.getKeyProperty())) {
                 this.joinColumn = joinTableInfo.getKeyColumn();
                 this.joinField = ReflectionKit.getFieldList(this.joinClass).stream().filter(i ->
                         i.getName().equals(joinTableInfo.getKeyProperty())).findFirst().orElse(null);
             }
         } else {
             this.joinColumn = joinFieldInfo.getColumn();
-            this.joinField = joinFieldInfo.getField();
+            this.joinField = getField(this.joinClass, joinFieldInfo);
         }
         Assert.notNull(this.joinField, "注解属性thisField不存在 %s , %s", this.joinClass.getName(),
                 StringUtils.isBlank(this.joinProperty) ? "主键" : this.joinProperty);
@@ -216,7 +218,7 @@ public class MPJTableFieldInfo {
         }
 
         TableInfo tableInfo = getTableInfo(this.entityType);
-        if (tableInfo.havePK() && this.thisProperty.equals(tableInfo.getKeyProperty())) {
+        if (AdapterHelper.getTableInfoAdapter().mpjHasPK(tableInfo) && this.thisProperty.equals(tableInfo.getKeyProperty())) {
             this.thisField = ReflectionKit.getFieldList(ClassUtils.getUserClass(entityType)).stream().filter(f ->
                     f.getName().equals(tableInfo.getKeyProperty())).findFirst().orElse(null);
             Assert.notNull(this.thisField, "注解属性thisField不存在 %s , %s", entityType.getName(),
@@ -224,10 +226,10 @@ public class MPJTableFieldInfo {
             this.thisColumn = tableInfo.getKeyColumn();
         } else {
             TableFieldInfo fieldInfo = tableInfo.getFieldList().stream().filter(f ->
-                    f.getField().getName().equals(this.thisProperty)).findFirst().orElse(null);
+                    f.getProperty().equals(this.thisProperty)).findFirst().orElse(null);
             Assert.notNull(fieldInfo, "注解属性thisField不存在 %s , %s", entityType.getName(),
                     StringUtils.isBlank(this.thisProperty) ? "主键" : this.thisProperty);
-            this.thisField = fieldInfo.getField();
+            this.thisField = getField(this.entityType, fieldInfo);
             this.thisColumn = fieldInfo.getColumn();
         }
         this.thisField.setAccessible(true);
@@ -311,6 +313,11 @@ public class MPJTableFieldInfo {
         return tableInfo;
     }
 
+    private Field getField(Class<?> table, TableFieldInfo tableFieldInfo) {
+        return AdapterHelper.getTableInfoAdapter().mpjGetField(tableFieldInfo, () ->
+                ReflectionKit.getFieldMap(table).get(tableFieldInfo.getProperty()));
+    }
+
     public void fieldSet(Object o, Object val) {
         try {
             this.field.set(o, val);
@@ -368,7 +375,7 @@ public class MPJTableFieldInfo {
         } else {
             if (data.size() > 1 && fieldInfo.isThrowExp()) {
                 throw ExceptionUtils.mpe("Expected one result (or null) to be returned by select, but found: " +
-                        data.size() + " , " + fieldInfo.getField().getName());
+                        data.size() + " , " + fieldInfo.getProperty());
             } else {
                 fieldInfo.fieldSet(i, data.stream().findFirst().orElse(null));
             }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index 1989687..e6082c8 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -1,9 +1,11 @@
 package com.github.yulichang.test.join;
 
+import com.baomidou.mybatisplus.core.MybatisPlusVersion;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.test.join.dto.AddressDTO;
 import com.github.yulichang.test.join.dto.UserDTO;
 import com.github.yulichang.test.join.entity.*;
@@ -959,13 +961,23 @@ class LambdaWrapperTest {
      */
     @Test
     void joinOrder() {
-        ThreadLocalUtils.set("SELECT id,user_id,name FROM order_t t ORDER BY t.name DESC",
-                "SELECT id,user_id,name FROM order_t t ORDER BY t.name desc");
+        if (VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.4.3") >= 0) {
+            ThreadLocalUtils.set("SELECT id,user_id,name FROM order_t t ORDER BY t.name DESC",
+                    "SELECT id,user_id,name FROM order_t t ORDER BY t.name desc");
+        } else {
+            ThreadLocalUtils.set("SELECT id,user_id,name FROM order_t t",
+                    "SELECT id,user_id,name FROM order_t t");
+        }
         MPJLambdaWrapper<OrderDO> wrapper = JoinWrappers.lambda(OrderDO.class);
         List<OrderDO> list = wrapper.list();
 
-        ThreadLocalUtils.set("SELECT t.id,t.user_id,t.name,t1.`name` AS userName FROM order_t t LEFT JOIN `user` t1 ON (t1.id = t.user_id) WHERE t1.del=false ORDER BY t.name DESC",
-                "SELECT t.id,t.user_id,t.name,t1.`name` AS userName FROM order_t t LEFT JOIN `user` t1 ON (t1.id = t.user_id) WHERE t1.del=false ORDER BY t.name desc");
+        if (VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.4.3") >= 0) {
+            ThreadLocalUtils.set("SELECT t.id,t.user_id,t.name,t1.`name` AS userName FROM order_t t LEFT JOIN `user` t1 ON (t1.id = t.user_id) WHERE t1.del=false ORDER BY t.name DESC",
+                    "SELECT t.id,t.user_id,t.name,t1.`name` AS userName FROM order_t t LEFT JOIN `user` t1 ON (t1.id = t.user_id) WHERE t1.del=false ORDER BY t.name desc");
+        } else {
+            ThreadLocalUtils.set("SELECT t.id,t.user_id,t.name,t1.`name` AS userName FROM order_t t LEFT JOIN `user` t1 ON (t1.id = t.user_id) WHERE t1.del=false",
+                    "SELECT t.id,t.user_id,t.name,t1.`name` AS userName FROM order_t t LEFT JOIN `user` t1 ON (t1.id = t.user_id) WHERE t1.del=false");
+        }
         MPJLambdaWrapper<OrderDO> w = JoinWrappers.lambda(OrderDO.class)
                 .selectAll(OrderDO.class)
                 .selectAs(UserDO::getName, OrderDO::getUserName)

From 46e04953bf7a9390a8863a2a84f4422dc07f9695 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 23 Oct 2023 16:51:45 +0800
Subject: [PATCH 04/88] 1.4.7

---
 README.md                                            |  4 ++--
 .../mybatis-plus-join-adapter-base/pom.xml           |  4 ++--
 .../mybatis-plus-join-adapter-v33x/pom.xml           |  6 +++---
 .../mybatis-plus-join-adapter-v3431/pom.xml          |  6 +++---
 .../mybatis-plus-join-adapter-v352/pom.xml           |  4 ++--
 mybatis-plus-join-adapter/pom.xml                    |  4 ++--
 mybatis-plus-join-annotation/pom.xml                 |  4 ++--
 mybatis-plus-join-boot-starter/pom.xml               |  6 +++---
 mybatis-plus-join-core/pom.xml                       | 12 ++++++------
 .../yulichang/config/MPJInterceptorConfig.java       |  2 +-
 mybatis-plus-join-extension/pom.xml                  |  6 +++---
 mybatis-plus-join-test/pom.xml                       | 12 +++---------
 mybatis-plus-join-test/test-base/pom.xml             |  4 ++--
 mybatis-plus-join-test/test-collection/pom.xml       |  4 ++--
 mybatis-plus-join-test/test-join/pom.xml             |  4 ++--
 mybatis-plus-join-test/test-kotlin/pom.xml           |  4 ++--
 mybatis-plus-join-test/test-mapping/pom.xml          |  4 ++--
 .../test-springboot3-jdk17/pom.xml                   |  4 ++--
 18 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index 3eae84e..6ff9df2 100644
--- a/README.md
+++ b/README.md
@@ -50,12 +50,12 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.6</version>
+      <version>1.4.7</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.6'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.7'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
index c685062..e1169de 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-adapter</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
     <artifactId>mybatis-plus-join-adapter-base</artifactId>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <name>mybatis-plus-join-adapter-base</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/pom.xml
index 76beec2..ec8297f 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-adapter</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
     <artifactId>mybatis-plus-join-adapter-v33x</artifactId>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <name>mybatis-plus-join-adapter-v33x</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-base</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/pom.xml
index c3e8ced..fa1ae09 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-adapter</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
     <artifactId>mybatis-plus-join-adapter-v3431</artifactId>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <name>mybatis-plus-join-adapter-v3431</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-base</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v352/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v352/pom.xml
index 7341246..aec3e55 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v352/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v352/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-adapter</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
     <artifactId>mybatis-plus-join-adapter-v352</artifactId>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <name>mybatis-plus-join-adapter-v352</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
diff --git a/mybatis-plus-join-adapter/pom.xml b/mybatis-plus-join-adapter/pom.xml
index 167863d..cacc7ea 100644
--- a/mybatis-plus-join-adapter/pom.xml
+++ b/mybatis-plus-join-adapter/pom.xml
@@ -5,10 +5,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
     <packaging>pom</packaging>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <artifactId>mybatis-plus-join-adapter</artifactId>
     <name>mybatis-plus-join-adapter</name>
 
diff --git a/mybatis-plus-join-annotation/pom.xml b/mybatis-plus-join-annotation/pom.xml
index 022ec60..4b9189e 100644
--- a/mybatis-plus-join-annotation/pom.xml
+++ b/mybatis-plus-join-annotation/pom.xml
@@ -7,9 +7,9 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <artifactId>mybatis-plus-join-annotation</artifactId>
     <name>mybatis-plus-join-annotation</name>
 
diff --git a/mybatis-plus-join-boot-starter/pom.xml b/mybatis-plus-join-boot-starter/pom.xml
index dfd6c0a..58cc3f2 100644
--- a/mybatis-plus-join-boot-starter/pom.xml
+++ b/mybatis-plus-join-boot-starter/pom.xml
@@ -7,9 +7,9 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <artifactId>mybatis-plus-join-boot-starter</artifactId>
     <name>mybatis-plus-join-boot-starter</name>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-extension</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/mybatis-plus-join-core/pom.xml b/mybatis-plus-join-core/pom.xml
index 19c687f..80f7a22 100644
--- a/mybatis-plus-join-core/pom.xml
+++ b/mybatis-plus-join-core/pom.xml
@@ -7,9 +7,9 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <artifactId>mybatis-plus-join-core</artifactId>
     <name>mybatis-plus-join-core</name>
 
@@ -47,22 +47,22 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-annotation</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-v33x</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-v3431</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-v352</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
index eddc1df..8867365 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
@@ -30,7 +30,7 @@ public class MPJInterceptorConfig {
             System.out.println(" _ _   |_  _ _|_. ___ _ |    _  .  _  .  _  \n" +
                     "| | |\\/|_)(_| | |_\\  |_)||_|_\\  | (_) | | | \n" +
                     "     /               |          /\n" +
-                    "                                    1.4.6");
+                    "                                    1.4.7");
         }
     }
 
diff --git a/mybatis-plus-join-extension/pom.xml b/mybatis-plus-join-extension/pom.xml
index 1a462ce..b94d011 100644
--- a/mybatis-plus-join-extension/pom.xml
+++ b/mybatis-plus-join-extension/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
     <artifactId>mybatis-plus-join-extension</artifactId>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <name>mybatis-plus-join-extension</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-core</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index 543664c..64bef9b 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -13,7 +13,7 @@
     <groupId>com.github.yulichang</groupId>
     <artifactId>mybatis-plus-join-test</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
 
     <name>mybatis-plus-join-test</name>
 
@@ -82,14 +82,8 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
-        <!-- PageHelper 兼容性测试 -->
-        <!--        <dependency>-->
-        <!--            <groupId>com.github.pagehelper</groupId>-->
-        <!--            <artifactId>pagehelper-spring-boot-starter</artifactId>-->
-        <!--            <version>1.4.6</version>-->
-        <!--        </dependency>-->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -98,7 +92,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.3.2</version>
+            <version>3.5.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/mybatis-plus-join-test/test-base/pom.xml b/mybatis-plus-join-test/test-base/pom.xml
index 7a031e3..60a0c5f 100644
--- a/mybatis-plus-join-test/test-base/pom.xml
+++ b/mybatis-plus-join-test/test-base/pom.xml
@@ -5,10 +5,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-test</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
     <artifactId>test-base</artifactId>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <name>test-base</name>
 
     <description>test-base</description>
diff --git a/mybatis-plus-join-test/test-collection/pom.xml b/mybatis-plus-join-test/test-collection/pom.xml
index 26f26ae..4c4b3f6 100644
--- a/mybatis-plus-join-test/test-collection/pom.xml
+++ b/mybatis-plus-join-test/test-collection/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-test</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
     </dependencies>
 
diff --git a/mybatis-plus-join-test/test-join/pom.xml b/mybatis-plus-join-test/test-join/pom.xml
index efe14f5..1d35e18 100644
--- a/mybatis-plus-join-test/test-join/pom.xml
+++ b/mybatis-plus-join-test/test-join/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-test</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/mybatis-plus-join-test/test-kotlin/pom.xml b/mybatis-plus-join-test/test-kotlin/pom.xml
index a8ec68d..20593a2 100644
--- a/mybatis-plus-join-test/test-kotlin/pom.xml
+++ b/mybatis-plus-join-test/test-kotlin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-test</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
     <artifactId>test-kotlin</artifactId>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
         <dependency>
             <groupId>com.mysql</groupId>
diff --git a/mybatis-plus-join-test/test-mapping/pom.xml b/mybatis-plus-join-test/test-mapping/pom.xml
index 883b6f4..d0ec832 100644
--- a/mybatis-plus-join-test/test-mapping/pom.xml
+++ b/mybatis-plus-join-test/test-mapping/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>mybatis-plus-join-test</artifactId>
         <groupId>com.github.yulichang</groupId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
index feeb68a..31f631c 100644
--- a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
+++ b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>mybatis-plus-join-test</artifactId>
         <groupId>com.github.yulichang</groupId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
     </dependencies>
 

From bc59b2329aa0e6668542d1889c2bdd4dacdc3d60 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 23 Oct 2023 16:56:25 +0800
Subject: [PATCH 05/88] 1.4.7

---
 mybatis-plus-join/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mybatis-plus-join/pom.xml b/mybatis-plus-join/pom.xml
index 398beaf..209e077 100644
--- a/mybatis-plus-join/pom.xml
+++ b/mybatis-plus-join/pom.xml
@@ -10,13 +10,13 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
     -->
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.yulichang</groupId>
     <artifactId>mybatis-plus-join</artifactId>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <name>mybatis-plus-join</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.7</version>
         </dependency>
     </dependencies>
 </project>

From 91c67c5e8251420bb031e178f363089737449179 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 23 Oct 2023 18:37:04 +0800
Subject: [PATCH 06/88] 1.4.7

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 26159d5..fe577bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.github.yulichang</groupId>
     <artifactId>mybatis-plus-join-root</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <name>mybatis-plus-join-root</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>

From bb93df99b48daaef1547741e88bae847cc6343bd Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Tue, 31 Oct 2023 01:38:06 +0800
Subject: [PATCH 07/88] =?UTF-8?q?fix=20union=E6=9D=A1=E4=BB=B6=E5=B5=8C?=
 =?UTF-8?q?=E5=A5=97=E5=8F=82=E6=95=B0=E5=90=8D=E9=97=AE=E9=A2=98=20https:?=
 =?UTF-8?q?//github.com/yulichang/mybatis-plus-join/issues/87=20https://gi?=
 =?UTF-8?q?tee.com/best=5Fhandsome/mybatis-plus-join/issues/I8C2QR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../github/yulichang/kt/KtAbstractWrapper.java   | 16 ++++++++--------
 .../com/github/yulichang/kt/KtLambdaWrapper.java | 10 ++++++----
 .../wrapper/MPJAbstractLambdaWrapper.java        |  5 +++--
 .../yulichang/wrapper/MPJAbstractWrapper.java    | 16 ++++++++--------
 .../yulichang/wrapper/MPJLambdaWrapper.java      | 10 ++++++----
 .../yulichang/test/join/entity/UserTTT.java      |  4 ----
 .../yulichang/test/join/LambdaWrapperTest.java   |  5 ++++-
 .../yulichang/test/kt/LambdaWrapperTest.kt       |  1 +
 8 files changed, 36 insertions(+), 31 deletions(-)
 delete mode 100644 mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTTT.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
index 4bf7235..2c0f733 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
@@ -64,7 +64,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      * 其他
      */
     /* mybatis plus 3.4.3新增 这个时wrapper的别名 不是MPJ的别名 */
-    protected SharedString paramAlias;
+    protected SharedString paramAlias = new SharedString(null);
     protected SharedString lastSql;
     /**
      * SQL注释
@@ -607,9 +607,10 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         paramNameSeq.set(0);
         paramNameValuePairs.clear();
         expression.clear();
-        lastSql.toEmpty();
-        sqlComment.toEmpty();
-        sqlFirst.toEmpty();
+        paramAlias.toNull();
+        if (Objects.nonNull(lastSql)) lastSql.toEmpty();
+        if (Objects.nonNull(sqlComment)) sqlComment.toEmpty();
+        if (Objects.nonNull(sqlFirst)) sqlFirst.toEmpty();
         tableList.clear();
         entityClass = null;
         onWrappers.clear();
@@ -658,7 +659,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     }
 
     public String getParamAlias() {
-        return paramAlias == null ? Constants.WRAPPER : paramAlias.getStringValue();
+        return paramAlias.getStringValue() == null ? Constants.WRAPPER : paramAlias.getStringValue();
     }
 
     /**
@@ -669,9 +670,8 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      */
     public Children setParamAlias(String paramAlias) {
         Assert.notEmpty(paramAlias, "paramAlias can not be empty!");
-        Assert.isTrue(CollectionUtils.isEmpty(paramNameValuePairs), "Please call this method before working!");
-        Assert.isNull(this.paramAlias, "Please do not call the method repeatedly!");
-        this.paramAlias = new SharedString(paramAlias);
+        Assert.isNull(this.paramAlias.getStringValue(), "Please do not call the method repeatedly!");
+        this.paramAlias.setStringValue(paramAlias);
         return typedThis;
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
index 04f7d6d..96b800b 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
@@ -125,7 +125,7 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
      * 不建议直接 new 该实例，使用 JoinWrappers.lambda(UserDO.class)
      */
     KtLambdaWrapper(T entity, Class<T> entityClass, SharedString sqlSelect, AtomicInteger paramNameSeq,
-                    Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
+                    Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments, SharedString paramAlias,
                     SharedString lastSql, SharedString sqlComment, SharedString sqlFirst,
                     TableList tableList, Integer index, String keyWord, Class<?> joinClass, String tableName) {
         super.setEntity(entity);
@@ -134,6 +134,7 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
         this.paramNameValuePairs = paramNameValuePairs;
         this.expression = mergeSegments;
         this.sqlSelect = sqlSelect;
+        this.paramAlias = paramAlias;
         this.lastSql = lastSql;
         this.sqlComment = sqlComment;
         this.sqlFirst = sqlFirst;
@@ -207,7 +208,7 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
     @SuppressWarnings("DuplicatedCode")
     public KtLambdaWrapper<T> selectSub(Class<?> clazz, String st, Consumer<KtLambdaWrapper<?>> consumer, KProperty<?> alias) {
         KtLambdaWrapper<?> wrapper = new KtLambdaWrapper(null, clazz, SharedString.emptyString(), paramNameSeq, paramNameValuePairs,
-                new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
+                new MergeSegments(), SharedString.emptyString(), this.paramAlias, SharedString.emptyString(), SharedString.emptyString(),
                 new TableList(), null, null, null, null) {
         };
         wrapper.tableList.setAlias(st);
@@ -348,7 +349,7 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
     @Override
     protected KtLambdaWrapper<T> instance(Integer index, String keyWord, Class<?> joinClass, String tableName) {
         return new KtLambdaWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs,
-                new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
+                new MergeSegments(), SharedString.emptyString(), this.paramAlias, SharedString.emptyString(), SharedString.emptyString(),
                 this.tableList, index, keyWord, joinClass, tableName);
     }
 
@@ -356,7 +357,8 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
     public void clear() {
         super.clear();
         selectDistinct = false;
-        sqlSelect.toNull();
+        sqlSelect.toEmpty();
+        if (Objects.nonNull(unionSql)) unionSql.toEmpty();
         selectColumns.clear();
         wrapperIndex = new AtomicInteger(0);
         wrapperMap.clear();
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
index d1dbc5d..38b5a75 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
@@ -23,6 +23,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -36,7 +37,7 @@ import static java.util.stream.Collectors.joining;
  *
  * @author yulichang
  */
-@SuppressWarnings({"DuplicatedCode", "unused", "LombokGetterMayBeUsed"})
+@SuppressWarnings({"DuplicatedCode", "unused"})
 public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLambdaWrapper<T, Children>>
         extends MPJAbstractWrapper<T, Children> implements QueryJoin<Children, T> {
 
@@ -455,7 +456,7 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
         this.dynamicTableName = false;
         this.tableFunc = null;
         this.logicDelType = ConfigProperties.logicDelType;
-        this.from.toNull();
+        this.from.toEmpty();
         this.hasAlias = false;
         this.keyWord = null;
         this.logicSql = true;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
index 5b8c5c5..768b9bb 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
@@ -59,7 +59,7 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      * 其他
      */
     /* mybatis plus 3.4.3新增 这个时wrapper的别名 不是MPJ的别名 */
-    protected SharedString paramAlias;
+    protected SharedString paramAlias = new SharedString(null);
     protected SharedString lastSql;
     /**
      * SQL注释
@@ -617,12 +617,13 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     @Override
     public void clear() {
         entity = null;
+        paramAlias.toNull();
         paramNameSeq.set(0);
         paramNameValuePairs.clear();
         expression.clear();
-        lastSql.toEmpty();
-        sqlComment.toEmpty();
-        sqlFirst.toEmpty();
+        if (Objects.nonNull(lastSql)) lastSql.toEmpty();
+        if (Objects.nonNull(sqlComment)) sqlComment.toEmpty();
+        if (Objects.nonNull(sqlFirst)) sqlFirst.toEmpty();
         tableList.clear();
         entityClass = null;
         onWrappers.clear();
@@ -671,7 +672,7 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     }
 
     public String getParamAlias() {
-        return paramAlias == null ? Constants.WRAPPER : paramAlias.getStringValue();
+        return paramAlias.getStringValue() == null ? Constants.WRAPPER : paramAlias.getStringValue();
     }
 
     /**
@@ -682,9 +683,8 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      */
     public Children setParamAlias(String paramAlias) {
         Assert.notEmpty(paramAlias, "paramAlias can not be empty!");
-        Assert.isTrue(CollectionUtils.isEmpty(paramNameValuePairs), "Please call this method before working!");
-        Assert.isNull(this.paramAlias, "Please do not call the method repeatedly!");
-        this.paramAlias = new SharedString(paramAlias);
+        Assert.isTrue(StringUtils.isBlank(this.paramAlias.getStringValue()), "Please do not call the method repeatedly!");
+        this.paramAlias.setStringValue(paramAlias);
         return typedThis;
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index 16d171c..e3f8338 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -123,7 +123,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
      * 不建议直接 new 该实例，使用 JoinWrappers.lambda(UserDO.class)
      */
     MPJLambdaWrapper(T entity, Class<T> entityClass, SharedString sqlSelect, AtomicInteger paramNameSeq,
-                     Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
+                     Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments, SharedString paramAlias,
                      SharedString lastSql, SharedString sqlComment, SharedString sqlFirst,
                      TableList tableList, Integer index, String keyWord, Class<?> joinClass, String tableName) {
         super.setEntity(entity);
@@ -132,6 +132,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
         this.paramNameValuePairs = paramNameValuePairs;
         this.expression = mergeSegments;
         this.sqlSelect = sqlSelect;
+        this.paramAlias = paramAlias;
         this.lastSql = lastSql;
         this.sqlComment = sqlComment;
         this.sqlFirst = sqlFirst;
@@ -207,7 +208,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     @SuppressWarnings("DuplicatedCode")
     public <E, F> MPJLambdaWrapper<T> selectSub(Class<E> clazz, String st, Consumer<MPJLambdaWrapper<E>> consumer, SFunction<F, ?> alias) {
         MPJLambdaWrapper<E> wrapper = new MPJLambdaWrapper<E>(null, clazz, SharedString.emptyString(), paramNameSeq, paramNameValuePairs,
-                new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
+                new MergeSegments(), this.paramAlias, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
                 new TableList(), null, null, null, null) {
         };
         wrapper.tableList.setAlias(st);
@@ -348,7 +349,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     @Override
     protected MPJLambdaWrapper<T> instance(Integer index, String keyWord, Class<?> joinClass, String tableName) {
         return new MPJLambdaWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs,
-                new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
+                new MergeSegments(), this.paramAlias, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
                 this.tableList, index, keyWord, joinClass, tableName);
     }
 
@@ -359,7 +360,8 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
         sqlSelect.toNull();
         selectColumns.clear();
         wrapperIndex = new AtomicInteger(0);
-        wrapperMap.clear();
+        if (Objects.nonNull(wrapperMap)) wrapperMap.clear();
+        if (Objects.nonNull(unionSql)) unionSql.toEmpty();
         resultMapMybatisLabel.clear();
     }
 }
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTTT.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTTT.java
deleted file mode 100644
index c7151c3..0000000
--- a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTTT.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.yulichang.test.join.entity;
-
-public class UserTTT extends UserDO{
-}
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index e6082c8..1d72f7e 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -1094,11 +1094,14 @@ class LambdaWrapperTest {
                 .eq(UserDO::getId, 1);
         MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
-                .eq(UserDO::getName, "张三 2");
+                .eq(UserDO::getName, "张三 2")
+                .and(w -> w.eq(UserDO::getName, "张三 2"));
         MPJLambdaWrapper<UserDO> wrapper2 = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
                 .eq(UserDO::getPid, 2);
         wrapper.union(wrapper1, wrapper2);
+
+        System.out.println(wrapper.getUnionSql());
         List<UserDO> list = wrapper.list();
 
         assert list.size() == 7;
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/com/github/yulichang/test/kt/LambdaWrapperTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/com/github/yulichang/test/kt/LambdaWrapperTest.kt
index e974a64..43b61de 100644
--- a/mybatis-plus-join-test/test-kotlin/src/test/com/github/yulichang/test/kt/LambdaWrapperTest.kt
+++ b/mybatis-plus-join-test/test-kotlin/src/test/com/github/yulichang/test/kt/LambdaWrapperTest.kt
@@ -1146,6 +1146,7 @@ class LambdaWrapperTest {
         val wrapper1: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
                 .selectAll(UserDO::class.java)
                 .eq(UserDO::name, "张三 2")
+                .and { a -> a.eq(UserDO::name, "张三 2") }
         val wrapper2: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
                 .selectAll(UserDO::class.java)
                 .eq(UserDO::pid, 2)

From 51f2231e9d4ff006fb5113d0909a966db6e15fa9 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Tue, 31 Oct 2023 01:55:08 +0800
Subject: [PATCH 08/88] =?UTF-8?q?fix=20union=E9=80=BB=E8=BE=91=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=97=AE=E9=A2=98=20https://gitee.com/best=5Fhandsome?=
 =?UTF-8?q?/mybatis-plus-join/issues/I8C2QR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/github/yulichang/toolkit/WrapperUtils.java | 3 +++
 .../github/yulichang/wrapper/MPJAbstractLambdaWrapper.java   | 3 ++-
 .../com/github/yulichang/test/join/LambdaWrapperTest.java    | 5 ++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java
index e52896e..7603cc6 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java
@@ -124,6 +124,9 @@ public class WrapperUtils {
     }
 
     private static String mainLogic(boolean hasWhere, Class<?> clazz, MPJLambdaWrapper<?> wrapper) {
+        if (!wrapper.getLogicSql()) {
+            return StringPool.EMPTY;
+        }
         String info = LogicInfoUtils.getLogicInfo(null, clazz, true, wrapper.getAlias());
         if (StringUtils.isNotBlank(info)) {
             if (hasWhere) {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
index 38b5a75..47b7bf8 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.OrderBy;
 import com.baomidou.mybatisplus.core.conditions.SharedString;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -23,7 +24,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -340,6 +340,7 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
                 if (StringUtils.isBlank(wrapper.from.getStringValue())) {
                     if (this.subLogicSql && this.logicDelType == LogicDelTypeEnum.ON) {
                         TableInfo tableInfo = TableHelper.get(wrapper.getJoinClass());
+                        Assert.notNull(tableInfo, "not find tableInfo by class %s", wrapper.getJoinClass().getName());
                         if (ConfigProperties.tableInfoAdapter.mpjHasLogic(tableInfo)) {
                             wrapper.appendSqlSegments(APPLY, () -> LogicInfoUtils.getLogicInfoNoAnd(
                                     wrapper.getIndex(), wrapper.getJoinClass(), wrapper.isHasAlias(), wrapper.getAlias()
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index 1d72f7e..0f78344 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -1088,20 +1088,19 @@ class LambdaWrapperTest {
      */
     @Test
     void union() {
-        ThreadLocalUtils.set();
+        ThreadLocalUtils.set("SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t WHERE t.del=false AND (t.id = ?) UNION SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t WHERE (t.`name` = ? AND (t.`name` = ?)) UNION SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t WHERE t.del=false AND (t.pid = ?)");
         MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
                 .eq(UserDO::getId, 1);
         MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
+                .disableLogicDel()
                 .eq(UserDO::getName, "张三 2")
                 .and(w -> w.eq(UserDO::getName, "张三 2"));
         MPJLambdaWrapper<UserDO> wrapper2 = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
                 .eq(UserDO::getPid, 2);
         wrapper.union(wrapper1, wrapper2);
-
-        System.out.println(wrapper.getUnionSql());
         List<UserDO> list = wrapper.list();
 
         assert list.size() == 7;

From fbb7f05fcb1137c944e2e70c5d218d33896bc76f Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Tue, 31 Oct 2023 23:27:05 +0800
Subject: [PATCH 09/88] =?UTF-8?q?fix=20MP=E5=A4=9A=E7=A7=9F=E6=88=B7sqlPar?=
 =?UTF-8?q?se=E8=A7=A3=E6=9E=90=E5=BC=82=E5=B8=B8=20https://gitee.com/best?=
 =?UTF-8?q?=5Fhandsome/mybatis-plus-join/issues/I8CAGY?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/MPJInterceptorConfig.java          |  2 +-
 .../yulichang/method/MPJAbstractMethod.java   | 20 ++++++++++++++++
 .../yulichang/method/SelectJoinCount.java     |  2 +-
 .../yulichang/method/SelectJoinList.java      |  2 +-
 .../yulichang/method/SelectJoinMap.java       |  2 +-
 .../yulichang/method/SelectJoinMaps.java      |  2 +-
 .../yulichang/method/SelectJoinMapsPage.java  |  2 +-
 .../yulichang/method/SelectJoinOne.java       |  2 +-
 .../yulichang/method/SelectJoinPage.java      |  2 +-
 .../github/yulichang/method/UpdateJoin.java   |  2 +-
 .../yulichang/method/UpdateJoinAndNull.java   |  2 +-
 .../yulichang/method/mp/SelectList.java       |  7 +++++-
 .../yulichang/method/mp/SelectMaps.java       |  5 ++++
 .../yulichang/method/mp/SelectMapsPage.java   |  5 ++++
 .../yulichang/method/mp/SelectObjs.java       | 11 +++++++++
 .../github/yulichang/method/mp/SelectOne.java | 11 +++++++++
 .../yulichang/method/mp/SelectPage.java       |  5 ++++
 .../yulichang/query/MPJQueryWrapper.java      | 10 +++++++-
 .../test/config/MybatisPlusConfig.java        | 15 ++++++++++++
 .../test/join/entity/UserTenantDO.java        | 23 +++++++++++++++++++
 .../test/join/mapper/UserTenantMapper.java    | 10 ++++++++
 .../test-join/src/main/resources/db/data.sql  | 13 ++++++++++-
 .../src/main/resources/db/schema.sql          |  9 ++++++++
 .../test/join/LambdaWrapperTest.java          | 13 +++++++----
 .../yulichang/test/join/QueryWrapperTest.java | 23 ++++++++++++++++---
 25 files changed, 179 insertions(+), 21 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTenantDO.java
 create mode 100644 mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/mapper/UserTenantMapper.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
index 8867365..22a510a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
@@ -30,7 +30,7 @@ public class MPJInterceptorConfig {
             System.out.println(" _ _   |_  _ _|_. ___ _ |    _  .  _  .  _  \n" +
                     "| | |\\/|_)(_| | |_\\  |_)||_|_\\  | (_) | | | \n" +
                     "     /               |          /\n" +
-                    "                                    1.4.7");
+                    "                                    1.4.8");
         }
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJAbstractMethod.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJAbstractMethod.java
index feef86a..469abc9 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJAbstractMethod.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJAbstractMethod.java
@@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
 import com.github.yulichang.adapter.v352.AbstractMethod352;
 import com.github.yulichang.config.ConfigProperties;
+import org.apache.ibatis.builder.SqlSourceBuilder;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.StringTokenizer;
 
 /**
  * @author yulichang
@@ -82,4 +84,22 @@ public abstract class MPJAbstractMethod extends AbstractMethod352 implements MPJ
             return "";
         }
     }
+
+    public String removeExtraWhitespaces(String sql) {
+        try {
+            return SqlSourceBuilder.removeExtraWhitespaces(sql);
+        } catch (Throwable t) {
+            StringTokenizer tokenizer = new StringTokenizer(sql);
+            StringBuilder builder = new StringBuilder();
+            boolean hasMoreTokens = tokenizer.hasMoreTokens();
+            while (hasMoreTokens) {
+                builder.append(tokenizer.nextToken());
+                hasMoreTokens = tokenizer.hasMoreTokens();
+                if (hasMoreTokens) {
+                    builder.append(' ');
+                }
+            }
+            return builder.toString();
+        }
+    }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinCount.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinCount.java
index 6fc295b..b8c5baa 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinCount.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinCount.java
@@ -27,7 +27,7 @@ public class SelectJoinCount extends MPJAbstractMethod {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_COUNT;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlCount(),
                 mpjTableName(tableInfo), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, removeExtraWhitespaces(sql), modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Long.class);
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinList.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinList.java
index f18ca33..fcd4f17 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinList.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinList.java
@@ -31,7 +31,7 @@ public class SelectJoinList extends MPJAbstractMethod {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_LIST;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlDistinct(), sqlSelectColumns(tableInfo, true),
                 mpjTableName(tableInfo), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), mpjSqlOrderBy(tableInfo), sqlComment());
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, removeExtraWhitespaces(sql), modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, MPJResultType.class);
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinMap.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinMap.java
index 74fd719..4c73c8b 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinMap.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinMap.java
@@ -32,7 +32,7 @@ public class SelectJoinMap extends MPJAbstractMethod {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_MAP;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlDistinct(), sqlSelectColumns(tableInfo, true),
                 mpjTableName(tableInfo), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, removeExtraWhitespaces(sql), modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Map.class);
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinMaps.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinMaps.java
index 7db4c14..446cf80 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinMaps.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinMaps.java
@@ -33,7 +33,7 @@ public class SelectJoinMaps extends MPJAbstractMethod {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_MAPS;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlDistinct(), sqlSelectColumns(tableInfo, true),
                 mpjTableName(tableInfo), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), mpjSqlOrderBy(tableInfo), sqlComment());
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, removeExtraWhitespaces(sql), modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Map.class);
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinMapsPage.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinMapsPage.java
index da609a2..60a1ed4 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinMapsPage.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinMapsPage.java
@@ -33,7 +33,7 @@ public class SelectJoinMapsPage extends MPJAbstractMethod {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_MAPS_PAGE;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlDistinct(), sqlSelectColumns(tableInfo, true),
                 mpjTableName(tableInfo), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), mpjSqlOrderBy(tableInfo), sqlComment());
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, removeExtraWhitespaces(sql), modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, Map.class);
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinOne.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinOne.java
index 3ded876..6b1042e 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinOne.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinOne.java
@@ -30,7 +30,7 @@ public class SelectJoinOne extends MPJAbstractMethod {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_ONE;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlDistinct(), sqlSelectColumns(tableInfo, true),
                 mpjTableName(tableInfo), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, removeExtraWhitespaces(sql), modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, MPJResultType.class);
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinPage.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinPage.java
index 49a512a..f531bcb 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinPage.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/SelectJoinPage.java
@@ -31,7 +31,7 @@ public class SelectJoinPage extends MPJAbstractMethod {
         SqlMethod sqlMethod = SqlMethod.SELECT_JOIN_PAGE;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), sqlDistinct(), sqlSelectColumns(tableInfo, true),
                 mpjTableName(tableInfo), sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), mpjSqlOrderBy(tableInfo), sqlComment());
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, removeExtraWhitespaces(sql), modelClass);
         return this.addSelectMappedStatementForOther(mapperClass, sqlMethod.getMethod(), sqlSource, MPJResultType.class);
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java
index aee7f04..c9fd322 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java
@@ -31,7 +31,7 @@ public class UpdateJoin extends MPJAbstractMethod {
         SqlMethod sqlMethod = SqlMethod.UPDATE_JOIN;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), mpjTableName(tableInfo), sqlAlias(), sqlFrom(),
                 mpjSqlSet(true, true, tableInfo, true, ENTITY, ENTITY_DOT), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, removeExtraWhitespaces(sql), modelClass);
         return this.addUpdateMappedStatement(mapperClass, modelClass, sqlMethod.getMethod(), sqlSource);
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoinAndNull.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoinAndNull.java
index 3796cb7..320c136 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoinAndNull.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoinAndNull.java
@@ -30,7 +30,7 @@ public class UpdateJoinAndNull extends MPJAbstractMethod {
         SqlMethod sqlMethod = SqlMethod.UPDATE_JOIN_AND_NULL;
         String sql = String.format(sqlMethod.getSql(), sqlFirst(), mpjTableName(tableInfo), sqlAlias(), sqlFrom(),
                 mpjSqlSet(true, true, tableInfo, true, ENTITY, ENTITY_DOT), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, removeExtraWhitespaces(sql), modelClass);
         return this.addUpdateMappedStatement(mapperClass, modelClass, sqlMethod.getMethod(), sqlSource);
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectList.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectList.java
index 90233ff..bfa8ed5 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectList.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectList.java
@@ -3,6 +3,7 @@ package com.github.yulichang.method.mp;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
 import com.github.yulichang.interfaces.MPJBaseJoin;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -35,8 +36,12 @@ public class SelectList extends com.baomidou.mybatisplus.core.injector.methods.S
 
     @Override
     protected String sqlOrderBy(TableInfo table) {
+        String orderBy = super.sqlOrderBy(table);
+        if (StringUtils.isBlank(orderBy)) {
+            return orderBy;
+        }
         return SqlScriptUtils.convertChoose(String.format("%s == null or !(%s instanceof %s)", Constants.WRAPPER, Constants.WRAPPER, MPJBaseJoin.class.getName()),
-                super.sqlOrderBy(table), mpjSqlOrderBy(table));
+                orderBy, mpjSqlOrderBy(table));
     }
 
     @Override
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMaps.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMaps.java
index 3b3a312..ed4ab63 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMaps.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMaps.java
@@ -3,6 +3,7 @@ package com.github.yulichang.method.mp;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
 import com.github.yulichang.interfaces.MPJBaseJoin;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -35,6 +36,10 @@ public class SelectMaps extends com.baomidou.mybatisplus.core.injector.methods.S
 
     @Override
     protected String sqlOrderBy(TableInfo table) {
+        String orderBy = super.sqlOrderBy(table);
+        if (StringUtils.isBlank(orderBy)) {
+            return orderBy;
+        }
         return SqlScriptUtils.convertChoose(String.format("%s == null or !(%s instanceof %s)", Constants.WRAPPER, Constants.WRAPPER, MPJBaseJoin.class.getName()),
                 super.sqlOrderBy(table), mpjSqlOrderBy(table));
     }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMapsPage.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMapsPage.java
index b9df82d..e22e3a6 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMapsPage.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMapsPage.java
@@ -3,6 +3,7 @@ package com.github.yulichang.method.mp;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
 import com.github.yulichang.interfaces.MPJBaseJoin;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -35,6 +36,10 @@ public class SelectMapsPage extends com.baomidou.mybatisplus.core.injector.metho
 
     @Override
     protected String sqlOrderBy(TableInfo table) {
+        String orderBy = super.sqlOrderBy(table);
+        if (StringUtils.isBlank(orderBy)) {
+            return orderBy;
+        }
         return SqlScriptUtils.convertChoose(String.format("%s == null or !(%s instanceof %s)", Constants.WRAPPER, Constants.WRAPPER, MPJBaseJoin.class.getName()),
                 super.sqlOrderBy(table), mpjSqlOrderBy(table));
     }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectObjs.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectObjs.java
index 00988ad..546793b 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectObjs.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectObjs.java
@@ -3,6 +3,7 @@ package com.github.yulichang.method.mp;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
 import com.github.yulichang.interfaces.MPJBaseJoin;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -48,6 +49,16 @@ public class SelectObjs extends com.baomidou.mybatisplus.core.injector.methods.S
                 selectColumns, mpjSqlSelectColumns() + StringPool.SPACE + selectColumns);
     }
 
+    @Override
+    protected String sqlOrderBy(TableInfo table) {
+        String orderBy = super.sqlOrderBy(table);
+        if (StringUtils.isBlank(orderBy)) {
+            return orderBy;
+        }
+        return SqlScriptUtils.convertChoose(String.format("%s == null or !(%s instanceof %s)", Constants.WRAPPER, Constants.WRAPPER, MPJBaseJoin.class.getName()),
+                super.sqlOrderBy(table), mpjSqlOrderBy(table));
+    }
+
     @Override
     protected String sqlComment() {
         return super.sqlComment() + StringPool.NEWLINE + SqlScriptUtils.convertIf("${ew.unionSql}", String.format("%s != null and (%s instanceof %s)",
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectOne.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectOne.java
index 1f93b0e..b8503e2 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectOne.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectOne.java
@@ -3,6 +3,7 @@ package com.github.yulichang.method.mp;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
 import com.github.yulichang.interfaces.MPJBaseJoin;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -45,6 +46,16 @@ public class SelectOne extends com.baomidou.mybatisplus.core.injector.methods.Se
                 selectColumns, mpjSqlSelectColumns() + StringPool.SPACE + selectColumns);
     }
 
+    @Override
+    protected String sqlOrderBy(TableInfo table) {
+        String orderBy = super.sqlOrderBy(table);
+        if (StringUtils.isBlank(orderBy)) {
+            return orderBy;
+        }
+        return SqlScriptUtils.convertChoose(String.format("%s == null or !(%s instanceof %s)", Constants.WRAPPER, Constants.WRAPPER, MPJBaseJoin.class.getName()),
+                super.sqlOrderBy(table), mpjSqlOrderBy(table));
+    }
+
     @Override
     protected String sqlComment() {
         return super.sqlComment() + StringPool.NEWLINE + SqlScriptUtils.convertIf("${ew.unionSql}", String.format("%s != null and (%s instanceof %s)",
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectPage.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectPage.java
index 5d20d10..adf9e34 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectPage.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectPage.java
@@ -3,6 +3,7 @@ package com.github.yulichang.method.mp;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
 import com.github.yulichang.interfaces.MPJBaseJoin;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -35,6 +36,10 @@ public class SelectPage extends com.baomidou.mybatisplus.core.injector.methods.S
 
     @Override
     protected String sqlOrderBy(TableInfo table) {
+        String orderBy = super.sqlOrderBy(table);
+        if (StringUtils.isBlank(orderBy)) {
+            return orderBy;
+        }
         return SqlScriptUtils.convertChoose(String.format("%s == null or !(%s instanceof %s)", Constants.WRAPPER, Constants.WRAPPER, MPJBaseJoin.class.getName()),
                 super.sqlOrderBy(table), mpjSqlOrderBy(table));
     }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
index 20ce880..8cab848 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
@@ -1,5 +1,6 @@
 package com.github.yulichang.query;
 
+import com.baomidou.mybatisplus.core.MybatisPlusVersion;
 import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
 import com.baomidou.mybatisplus.core.conditions.SharedString;
 import com.baomidou.mybatisplus.core.conditions.query.Query;
@@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
+import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.query.interfaces.StringJoin;
 import com.github.yulichang.toolkit.Asserts;
@@ -89,7 +91,13 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
     }
 
     public MPJQueryWrapper(Class<T> clazz) {
-        super.setEntityClass(clazz);
+        try {
+            super.setEntityClass(clazz);
+        } catch (NoSuchMethodError error) {
+            if (VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.3.0") > 0) {
+                throw error;
+            }
+        }
         super.initNeed();
     }
 
diff --git a/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java b/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java
index a0c2f95..2d9c743 100644
--- a/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java
+++ b/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java
@@ -8,11 +8,15 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
 import com.github.yulichang.injector.MPJSqlInjector;
 import com.github.yulichang.test.util.ThreadLocalUtils;
 import lombok.SneakyThrows;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.LongValue;
 import org.apache.ibatis.builder.SqlSourceBuilder;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.statement.StatementHandler;
@@ -44,6 +48,17 @@ public class MybatisPlusConfig {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
         PaginationInnerInterceptor page = new PaginationInnerInterceptor(DbType.H2);
         page.setOptimizeJoin(false);
+        interceptor.addInnerInterceptor(new TenantLineInnerInterceptor(new TenantLineHandler() {
+            @Override
+            public Expression getTenantId() {
+                return new LongValue(1);
+            }
+
+            @Override
+            public boolean ignoreTable(String tableName) {
+                return !"user_tenant".equals(tableName);
+            }
+        }));
         interceptor.addInnerInterceptor(page);
         interceptor.addInnerInterceptor(new SqlInterceptor());
         return interceptor;
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTenantDO.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTenantDO.java
new file mode 100644
index 0000000..91efc27
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTenantDO.java
@@ -0,0 +1,23 @@
+package com.github.yulichang.test.join.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.FieldNameConstants;
+
+@Data
+@ToString
+@FieldNameConstants
+@TableName(value = "user_tenant")
+public class UserTenantDO {
+
+    @TableId
+    private Integer id;
+
+
+    private Integer userId;
+
+    private Integer tenantId;
+}
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/mapper/UserTenantMapper.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/mapper/UserTenantMapper.java
new file mode 100644
index 0000000..dddf8d8
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/mapper/UserTenantMapper.java
@@ -0,0 +1,10 @@
+package com.github.yulichang.test.join.mapper;
+
+import com.github.yulichang.test.join.entity.UserTenantDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserTenantMapper extends MyBaseMapper<UserTenantDO> {
+
+
+}
diff --git a/mybatis-plus-join-test/test-join/src/main/resources/db/data.sql b/mybatis-plus-join-test/test-join/src/main/resources/db/data.sql
index 55ec13a..e9e4427 100644
--- a/mybatis-plus-join-test/test-join/src/main/resources/db/data.sql
+++ b/mybatis-plus-join-test/test-join/src/main/resources/db/data.sql
@@ -99,4 +99,15 @@ INSERT INTO order_t (id, user_id, age, name) VALUES
 (5, 5, 4, '5,4'),
 (6, 6, 3, '6,3'),
 (7, 7, 2, '7,2'),
-(8, 8, 1, '8,1');
\ No newline at end of file
+(8, 8, 1, '8,1');
+
+DELETE FROM user_tenant;
+INSERT INTO user_tenant (id,user_id, tenant_id) VALUES
+(1, 1, 1),
+(2, 2, 1),
+(3, 3, 1),
+(4, 4, 1),
+(5, 5, 1),
+(6, 6, 2),
+(7, 7, 2),
+(8, 8, 2);
\ No newline at end of file
diff --git a/mybatis-plus-join-test/test-join/src/main/resources/db/schema.sql b/mybatis-plus-join-test/test-join/src/main/resources/db/schema.sql
index 9e9c7ef..64c7602 100644
--- a/mybatis-plus-join-test/test-join/src/main/resources/db/schema.sql
+++ b/mybatis-plus-join-test/test-join/src/main/resources/db/schema.sql
@@ -63,4 +63,13 @@ create table order_t
     user_id int           null,
     age     int           null,
     name    varchar(255)  null
+);
+
+DROP TABLE IF EXISTS user_tenant;
+create table user_tenant
+(
+    id      int auto_increment
+        primary key,
+    user_id int           null,
+    tenant_id int           null
 );
\ No newline at end of file
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index 0f78344..90b31b4 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -680,7 +680,9 @@ class LambdaWrapperTest {
                 .eq(UserDO::getName, "ref");
         userMapper.selectList(wrapper);
         try {
-            userMapper.insertBatchSomeColumn(new ArrayList<>());
+            userMapper.insertBatchSomeColumn(new ArrayList<UserDO>() {{
+                add(new UserDO());
+            }});
         } catch (BadSqlGrammarException ignored) {
         }
     }
@@ -774,7 +776,7 @@ class LambdaWrapperTest {
      */
     @Test
     void testTable() {
-        ThreadLocalUtils.set("SELECT t.id FROM `user`bbbbbbb t LEFT JOIN addressaaaaaaaaaa t1 ON (t1.user_id = t.id) LEFT JOIN area t2 ON (t2.id = t1.area_id) WHERE t.del=false AND t1.del=false AND t2.del=false AND (t.id <= ?) ORDER BY t.id DESC");
+        ThreadLocalUtils.set("SELECT t.id FROM bbbbbbb t LEFT JOIN addressaaaaaaaaaa t1 ON (t1.user_id = t.id) LEFT JOIN area t2 ON (t2.id = t1.area_id) WHERE t.del=false AND t1.del=false AND t2.del=false AND (t.id <= ?) ORDER BY t.id DESC");
         MPJLambdaWrapper<UserDO> wrapper = new MPJLambdaWrapper<UserDO>()
                 .select(UserDO::getId)
                 .leftJoin(AddressDO.class, on -> on
@@ -783,10 +785,11 @@ class LambdaWrapperTest {
                 .leftJoin(AreaDO.class, AreaDO::getId, AddressDO::getAreaId)
                 .le(UserDO::getId, 10000)
                 .orderByDesc(UserDO::getId)
-                .setTableName(name -> name + "bbbbbbb");
+                .setTableName(name -> "bbbbbbb");
         try {
             List<UserDTO> list = userMapper.selectJoinList(UserDTO.class, wrapper);
         } catch (BadSqlGrammarException ignored) {
+
         }
     }
 
@@ -1050,7 +1053,7 @@ class LambdaWrapperTest {
      */
     @Test
     void sub() {
-        ThreadLocalUtils.set("SELECT ( SELECT st.id FROM `user` st WHERE st.del=false AND (st.id = t.id) limit 1 ) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t.id <= ?)");
+        ThreadLocalUtils.set("SELECT (SELECT st.id FROM `user` st WHERE st.del = false AND (st.id = t.id) LIMIT 1) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del = false AND t1.del = false AND (t.id <= ?)");
         MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
                 .selectSub(UserDO.class, w -> w.select(UserDO::getId)
                         .eq(UserDO::getId, UserDO::getId)
@@ -1059,7 +1062,7 @@ class LambdaWrapperTest {
                 .le(UserDO::getId, 100);
         wrapper.list();
 
-        ThreadLocalUtils.set("SELECT ( SELECT st.id FROM area st WHERE st.del=false AND (st.id = t1.id) limit 1 ) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t.id <= ?)");
+        ThreadLocalUtils.set("SELECT (SELECT st.id FROM area st WHERE st.del = false AND (st.id = t1.id) LIMIT 1) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del = false AND t1.del = false AND (t.id <= ?)");
         MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
                 .selectSub(AreaDO.class, w -> w.select(AreaDO::getId)
                         .eq(AreaDO::getId, AddressDO::getId)
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/QueryWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/QueryWrapperTest.java
index f29b628..43ec2cc 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/QueryWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/QueryWrapperTest.java
@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.query.MPJQueryWrapper;
 import com.github.yulichang.test.join.dto.UserDTO;
 import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.join.entity.UserTenantDO;
 import com.github.yulichang.test.join.mapper.UserMapper;
+import com.github.yulichang.test.join.mapper.UserTenantMapper;
 import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.toolkit.JoinWrappers;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.jdbc.BadSqlGrammarException;
@@ -20,6 +23,10 @@ class QueryWrapperTest {
     @Resource
     private UserMapper userMapper;
 
+    @Resource
+    private UserTenantMapper userTenantMapper;
+
+
     /**
      * 链表查询
      */
@@ -30,6 +37,16 @@ class QueryWrapperTest {
                 .select("name AS nameName")
                 .last("LIMIT 1"));
         System.out.println(dto);
+
+
+        IPage<UserDTO> iPage1 = userTenantMapper.selectJoinPage(new Page<>(1, 10), UserDTO.class,
+                JoinWrappers.query(UserTenantDO.class)
+                        .selectAll(UserTenantDO.class)
+                        .select("t1.name as PName")
+                        .leftJoin("(select * from `user` where id <> -1) t1 on t1.id = t.user_id")
+                        .apply("t.id <> -1"));
+
+        iPage1.getRecords().forEach(System.out::println);
     }
 
     /**
@@ -37,11 +54,11 @@ class QueryWrapperTest {
      */
     @Test
     void table() {
-        ThreadLocalUtils.set("SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by,name AS nameName FROM `user`fwear t WHERE t.del=false LIMIT 1",
-                "SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img AS img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by,name AS nameName FROM `user`fwear t WHERE t.del=false LIMIT 1");
+        ThreadLocalUtils.set("SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by,name AS nameName FROM fwear t WHERE t.del=false LIMIT 1",
+                "SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img AS img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by,name AS nameName FROM fwear t WHERE t.del=false LIMIT 1");
         MPJQueryWrapper<UserDO> wrapper = new MPJQueryWrapper<UserDO>()
                 .selectAll(UserDO.class)
-                .setTableName(name -> name + "fwear")
+                .setTableName(name -> "fwear")
                 .select("name AS nameName")
                 .last("LIMIT 1");
         try {

From 4bf4d25c9cc4394b8bb67125e68cf36f3b35582d Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 1 Nov 2023 12:20:05 +0800
Subject: [PATCH 10/88] 1.4.7.1

---
 README.md                                            |  7 +++----
 .../mybatis-plus-join-adapter-base/pom.xml           |  4 ++--
 .../mybatis-plus-join-adapter-v33x/pom.xml           |  6 +++---
 .../mybatis-plus-join-adapter-v3431/pom.xml          |  6 +++---
 .../mybatis-plus-join-adapter-v352/pom.xml           |  4 ++--
 mybatis-plus-join-adapter/pom.xml                    |  4 ++--
 mybatis-plus-join-annotation/pom.xml                 |  4 ++--
 mybatis-plus-join-boot-starter/pom.xml               |  6 +++---
 mybatis-plus-join-core/pom.xml                       | 12 ++++++------
 .../yulichang/config/MPJInterceptorConfig.java       |  2 +-
 mybatis-plus-join-extension/pom.xml                  |  6 +++---
 mybatis-plus-join-test/pom.xml                       |  6 +++---
 mybatis-plus-join-test/test-base/pom.xml             |  4 ++--
 mybatis-plus-join-test/test-collection/pom.xml       |  4 ++--
 mybatis-plus-join-test/test-join/pom.xml             |  4 ++--
 mybatis-plus-join-test/test-kotlin/pom.xml           |  4 ++--
 mybatis-plus-join-test/test-mapping/pom.xml          |  4 ++--
 .../test-springboot3-jdk17/pom.xml                   |  4 ++--
 mybatis-plus-join/pom.xml                            |  6 +++---
 pom.xml                                              |  2 +-
 20 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index 6ff9df2..9890240 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,10 @@
    <img alt="Mybatis-Plus-Join-Logo" src="https://mybatisplusjoin.com/lg.png">
   </a>
 </p>
+<h1 align="center">MyBatis-Plus-Join</h1>
 <p align="center">
   为简化开发工作、提高生产率而生
 </p>
-
 <p align="center">
   <a href="https://github.com/yulichang/mybatis-plus-join" target="_blank">
     <img src="https://img.shields.io/github/stars/yulichang/mybatis-plus-join.svg?style=social&label=Stars" alt=""/>
@@ -24,7 +24,6 @@
     <img alt="code style" src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square">
   </a>
 </p>
-<h1 align="center">MyBatis-Plus-Join</h1>
 <p align="center">
 对 <a href="https://gitee.com/baomidou/mybatis-plus" target="_blank">MyBatis-Plus</a> 多表查询的扩展 |
 <a href="https://gitee.com/best_handsome/mybatis-plus-join-demo" target="_blank">演示工程</a> |
@@ -50,12 +49,12 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.7</version>
+      <version>1.4.7.1</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.7'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.7.1'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
index e1169de..5d1415a 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-adapter</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
     <artifactId>mybatis-plus-join-adapter-base</artifactId>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
     <name>mybatis-plus-join-adapter-base</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/pom.xml
index ec8297f..af5d43d 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-adapter</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
     <artifactId>mybatis-plus-join-adapter-v33x</artifactId>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
     <name>mybatis-plus-join-adapter-v33x</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-base</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/pom.xml
index fa1ae09..01a9e3f 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-adapter</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
     <artifactId>mybatis-plus-join-adapter-v3431</artifactId>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
     <name>mybatis-plus-join-adapter-v3431</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-base</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v352/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v352/pom.xml
index aec3e55..17c3240 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v352/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v352/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-adapter</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
     <artifactId>mybatis-plus-join-adapter-v352</artifactId>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
     <name>mybatis-plus-join-adapter-v352</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
diff --git a/mybatis-plus-join-adapter/pom.xml b/mybatis-plus-join-adapter/pom.xml
index cacc7ea..2748f33 100644
--- a/mybatis-plus-join-adapter/pom.xml
+++ b/mybatis-plus-join-adapter/pom.xml
@@ -5,10 +5,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
     <packaging>pom</packaging>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
     <artifactId>mybatis-plus-join-adapter</artifactId>
     <name>mybatis-plus-join-adapter</name>
 
diff --git a/mybatis-plus-join-annotation/pom.xml b/mybatis-plus-join-annotation/pom.xml
index 4b9189e..ccc0e0f 100644
--- a/mybatis-plus-join-annotation/pom.xml
+++ b/mybatis-plus-join-annotation/pom.xml
@@ -7,9 +7,9 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
     <artifactId>mybatis-plus-join-annotation</artifactId>
     <name>mybatis-plus-join-annotation</name>
 
diff --git a/mybatis-plus-join-boot-starter/pom.xml b/mybatis-plus-join-boot-starter/pom.xml
index 58cc3f2..53457b4 100644
--- a/mybatis-plus-join-boot-starter/pom.xml
+++ b/mybatis-plus-join-boot-starter/pom.xml
@@ -7,9 +7,9 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
     <artifactId>mybatis-plus-join-boot-starter</artifactId>
     <name>mybatis-plus-join-boot-starter</name>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-extension</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/mybatis-plus-join-core/pom.xml b/mybatis-plus-join-core/pom.xml
index 80f7a22..f570f35 100644
--- a/mybatis-plus-join-core/pom.xml
+++ b/mybatis-plus-join-core/pom.xml
@@ -7,9 +7,9 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
     <artifactId>mybatis-plus-join-core</artifactId>
     <name>mybatis-plus-join-core</name>
 
@@ -47,22 +47,22 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-annotation</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-v33x</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-v3431</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-v352</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
index 22a510a..c1ea47b 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
@@ -30,7 +30,7 @@ public class MPJInterceptorConfig {
             System.out.println(" _ _   |_  _ _|_. ___ _ |    _  .  _  .  _  \n" +
                     "| | |\\/|_)(_| | |_\\  |_)||_|_\\  | (_) | | | \n" +
                     "     /               |          /\n" +
-                    "                                    1.4.8");
+                    "                                    1.4.7.1");
         }
     }
 
diff --git a/mybatis-plus-join-extension/pom.xml b/mybatis-plus-join-extension/pom.xml
index b94d011..dd5650a 100644
--- a/mybatis-plus-join-extension/pom.xml
+++ b/mybatis-plus-join-extension/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
     <artifactId>mybatis-plus-join-extension</artifactId>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
     <name>mybatis-plus-join-extension</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-core</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index 64bef9b..e8ac9ea 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -13,7 +13,7 @@
     <groupId>com.github.yulichang</groupId>
     <artifactId>mybatis-plus-join-test</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
 
     <name>mybatis-plus-join-test</name>
 
@@ -24,7 +24,7 @@
         <module>test-mapping</module>
 
         <!-- 以下两个模块需要jdk17+, 使用jdk8会出现编译错误, 如果有安装jdk17+可以打开这两个模块 -->
-<!--        <module>test-kotlin</module>-->
+        <module>test-kotlin</module>
 <!--        <module>test-springboot3-jdk17</module>-->
     </modules>
 
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/mybatis-plus-join-test/test-base/pom.xml b/mybatis-plus-join-test/test-base/pom.xml
index 60a0c5f..1d229e8 100644
--- a/mybatis-plus-join-test/test-base/pom.xml
+++ b/mybatis-plus-join-test/test-base/pom.xml
@@ -5,10 +5,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-test</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
     <artifactId>test-base</artifactId>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
     <name>test-base</name>
 
     <description>test-base</description>
diff --git a/mybatis-plus-join-test/test-collection/pom.xml b/mybatis-plus-join-test/test-collection/pom.xml
index 4c4b3f6..70d5cb3 100644
--- a/mybatis-plus-join-test/test-collection/pom.xml
+++ b/mybatis-plus-join-test/test-collection/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-test</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
     </dependencies>
 
diff --git a/mybatis-plus-join-test/test-join/pom.xml b/mybatis-plus-join-test/test-join/pom.xml
index 1d35e18..460f033 100644
--- a/mybatis-plus-join-test/test-join/pom.xml
+++ b/mybatis-plus-join-test/test-join/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-test</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/mybatis-plus-join-test/test-kotlin/pom.xml b/mybatis-plus-join-test/test-kotlin/pom.xml
index 20593a2..56d681b 100644
--- a/mybatis-plus-join-test/test-kotlin/pom.xml
+++ b/mybatis-plus-join-test/test-kotlin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-test</artifactId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
     <artifactId>test-kotlin</artifactId>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.mysql</groupId>
diff --git a/mybatis-plus-join-test/test-mapping/pom.xml b/mybatis-plus-join-test/test-mapping/pom.xml
index d0ec832..a751e70 100644
--- a/mybatis-plus-join-test/test-mapping/pom.xml
+++ b/mybatis-plus-join-test/test-mapping/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>mybatis-plus-join-test</artifactId>
         <groupId>com.github.yulichang</groupId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
index 31f631c..23b1217 100644
--- a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
+++ b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>mybatis-plus-join-test</artifactId>
         <groupId>com.github.yulichang</groupId>
-        <version>1.4.7</version>
+        <version>1.4.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
     </dependencies>
 
diff --git a/mybatis-plus-join/pom.xml b/mybatis-plus-join/pom.xml
index 209e077..fad59a0 100644
--- a/mybatis-plus-join/pom.xml
+++ b/mybatis-plus-join/pom.xml
@@ -10,13 +10,13 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
     -->
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.yulichang</groupId>
     <artifactId>mybatis-plus-join</artifactId>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
     <name>mybatis-plus-join</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.4.7</version>
+            <version>1.4.7.1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index fe577bb..a14c1d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.github.yulichang</groupId>
     <artifactId>mybatis-plus-join-root</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.7</version>
+    <version>1.4.7.1</version>
     <name>mybatis-plus-join-root</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>

From 289127c0f683843950c51fe76e08d891612b6a4a Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 1 Nov 2023 23:27:06 +0800
Subject: [PATCH 11/88] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8E=9F=E7=94=9F?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=88=AB=E5=90=8D=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/interceptor/MPJInterceptor.java | 89 +++++++++++++------
 .../test/join/entity/UserTenantDO.java        |  9 +-
 .../test/join/LambdaWrapperTest.java          | 18 ++--
 3 files changed, 80 insertions(+), 36 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
index 3eec2ec..696d21a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
@@ -2,19 +2,24 @@ package com.github.yulichang.interceptor;
 
 import com.baomidou.mybatisplus.core.MybatisPlusVersion;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.config.ConfigProperties;
+import com.github.yulichang.interfaces.MPJBaseJoin;
 import com.github.yulichang.method.MPJResultType;
 import com.github.yulichang.query.MPJQueryWrapper;
-import com.github.yulichang.toolkit.*;
+import com.github.yulichang.toolkit.Constant;
+import com.github.yulichang.toolkit.MPJReflectionKit;
+import com.github.yulichang.toolkit.MPJTableMapperHelper;
+import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.support.FieldCache;
 import com.github.yulichang.wrapper.interfaces.SelectWrapper;
 import com.github.yulichang.wrapper.resultmap.IResult;
 import com.github.yulichang.wrapper.resultmap.Label;
 import com.github.yulichang.wrapper.segments.Select;
 import com.github.yulichang.wrapper.segments.SelectLabel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.ResultFlag;
@@ -50,6 +55,9 @@ public class MPJInterceptor implements Interceptor {
      */
     private static final Map<String, Map<Configuration, MappedStatement>> MS_CACHE = new ConcurrentHashMap<>();
 
+    private static final Map<String, Val> MS_MAPPER_CACHE = new ConcurrentHashMap<>();
+
+    private static final Map<String, Val> RES_MAPPER_CACHE = new ConcurrentHashMap<>();
 
     @Override
     @SuppressWarnings("Java8MapApi")
@@ -60,14 +68,27 @@ public class MPJInterceptor implements Interceptor {
             if (args[1] instanceof Map) {
                 Map<String, Object> map = (Map<String, Object>) args[1];
                 Object ew = map.containsKey(Constants.WRAPPER) ? map.get(Constants.WRAPPER) : null;
-                if (CollectionUtils.isNotEmpty(map) && map.containsKey(Constant.CLAZZ)) {
-                    Class<?> clazz = (Class<?>) map.get(Constant.CLAZZ);
-                    if (Objects.nonNull(clazz)) {
-                        List<ResultMap> list = ms.getResultMaps();
-                        if (CollectionUtils.isNotEmpty(list)) {
-                            ResultMap resultMap = list.get(0);
-                            if (resultMap.getType() == MPJResultType.class) {
-                                args[0] = getMappedStatement(ms, clazz, ew);
+                if (Objects.nonNull(ew) && ew instanceof MPJBaseJoin) {
+                    if (CollectionUtils.isNotEmpty(map)) {
+                        Class<?> rt = null;
+                        if (map.containsKey(Constant.CLAZZ)) {
+                            rt = (Class<?>) map.get(Constant.CLAZZ);
+                        } else {
+                            if (CollectionUtils.isNotEmpty(ms.getResultMaps())) {
+                                Class<?> entity = MPJTableMapperHelper.getEntity(getMapper(ms.getId(), ms.getResource()));
+                                Class<?> type = ms.getResultMaps().get(0).getType();
+                                if (Objects.nonNull(entity) && Objects.nonNull(type) && entity == type) {
+                                    rt = type;
+                                }
+                            }
+                        }
+                        if (Objects.nonNull(rt)) {
+                            List<ResultMap> list = ms.getResultMaps();
+                            if (CollectionUtils.isNotEmpty(list)) {
+                                ResultMap resultMap = list.get(0);
+                                if (resultMap.getType() == MPJResultType.class) {
+                                    args[0] = getMappedStatement(ms, rt, ew);
+                                }
                             }
                         }
                     }
@@ -87,7 +108,7 @@ public class MPJInterceptor implements Interceptor {
         if (ew instanceof SelectWrapper) {
             SelectWrapper wrapper = (SelectWrapper) ew;
             if (wrapper.getEntityClass() == null) {
-                wrapper.setEntityClass(MPJTableMapperHelper.getEntity(getEntity(ms.getId(), ms.getResource())));
+                wrapper.setEntityClass(MPJTableMapperHelper.getEntity(getMapper(ms.getId(), ms.getResource())));
             }
             if (wrapper.getSelectColumns().isEmpty() && wrapper.getEntityClass() != null) {
                 wrapper.selectAll(wrapper.getEntityClass());
@@ -360,29 +381,37 @@ public class MPJInterceptor implements Interceptor {
         }
     }
 
-    private Class<?> getEntity(String id, String resource) {
-        Class<?> clazz = null;
-        try {
-            String className = id.substring(0, id.lastIndexOf(StringPool.DOT));
+    private Class<?> getMapper(String id, String resource) {
+        Class<?> clazz = MS_MAPPER_CACHE.computeIfAbsent(id, key -> {
             try {
-                clazz = Class.forName(className);
-            } catch (ClassNotFoundException e) {
-                clazz = MPJTableMapperHelper.getMapperForName(className);
+                String className = key.substring(0, key.lastIndexOf(StringPool.DOT));
+                try {
+                    return new Val(Class.forName(className));
+                } catch (ClassNotFoundException e) {
+                    return new Val(MPJTableMapperHelper.getMapperForName(className));
+                }
+            } catch (Exception ignored) {
+                return new Val(null);
             }
-        } catch (Exception ignored) {
-        }
+        }).getVal();
+
         if (Objects.nonNull(clazz)) {
             return clazz;
         }
-        try {
-            String className = resource.substring(0, id.lastIndexOf(StringPool.DOT)).replaceAll("/", StringPool.DOT);
+
+        clazz = RES_MAPPER_CACHE.computeIfAbsent(resource, key -> {
             try {
-                clazz = Class.forName(className);
-            } catch (ClassNotFoundException e) {
-                clazz = MPJTableMapperHelper.getMapperForName(className);
+                String className = key.substring(0, key.lastIndexOf(StringPool.DOT)).replaceAll("/", StringPool.DOT);
+                try {
+                    return new Val(Class.forName(className));
+                } catch (ClassNotFoundException e) {
+                    return new Val(MPJTableMapperHelper.getMapperForName(className));
+                }
+            } catch (Exception ignored) {
+                return new Val(null);
             }
-        } catch (Exception ignored) {
-        }
+        }).getVal();
+
         return clazz;
     }
 
@@ -410,4 +439,10 @@ public class MPJInterceptor implements Interceptor {
         } catch (Exception ignored) {
         }
     }
+
+    @Data
+    @AllArgsConstructor
+    public static class Val {
+        private Class<?> val;
+    }
 }
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTenantDO.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTenantDO.java
index 91efc27..f9397e3 100644
--- a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTenantDO.java
+++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/UserTenantDO.java
@@ -1,6 +1,7 @@
 package com.github.yulichang.test.join.entity;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -13,11 +14,11 @@ import lombok.experimental.FieldNameConstants;
 @TableName(value = "user_tenant")
 public class UserTenantDO {
 
-    @TableId
-    private Integer id;
+    @TableId("id")
+    private Integer idea;
 
-
-    private Integer userId;
+    @TableField("user_id")
+    private Integer uuid;
 
     private Integer tenantId;
 }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index 90b31b4..df12348 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -9,10 +9,7 @@ import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.test.join.dto.AddressDTO;
 import com.github.yulichang.test.join.dto.UserDTO;
 import com.github.yulichang.test.join.entity.*;
-import com.github.yulichang.test.join.mapper.AddressMapper;
-import com.github.yulichang.test.join.mapper.OrderMapper;
-import com.github.yulichang.test.join.mapper.UserDTOMapper;
-import com.github.yulichang.test.join.mapper.UserMapper;
+import com.github.yulichang.test.join.mapper.*;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
 import com.github.yulichang.toolkit.JoinWrappers;
@@ -54,11 +51,23 @@ class LambdaWrapperTest {
     @Autowired
     private OrderMapper orderMapper;
 
+    @Autowired
+    private UserTenantMapper userTenantMapper;
+
     @BeforeEach
     void setUp() {
         Reset.reset();
     }
 
+    @Test
+    void testSimple() {
+        MPJLambdaWrapper<UserTenantDO> lambda = JoinWrappers.lambda(UserTenantDO.class);
+        lambda.selectAs(UserTenantDO::getIdea, UserTenantDO::getIdea);
+        List<UserTenantDO> list = userTenantMapper.selectList(lambda);
+
+        assert list.size() == 5 && list.get(0).getIdea() != null;
+    }
+
     @Test
     void testJoin() {
         ThreadLocalUtils.set("SELECT t.id,\n" +
@@ -985,7 +994,6 @@ class LambdaWrapperTest {
                 .selectAll(OrderDO.class)
                 .selectAs(UserDO::getName, OrderDO::getUserName)
                 .leftJoin(UserDO.class, UserDO::getId, OrderDO::getUserId);
-        System.out.println(wrapper.getFrom());
         List<OrderDO> l = w.list();
     }
 

From b83963a61ce6cdf4536d712cd305731c794ece58 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Thu, 2 Nov 2023 01:08:57 +0800
Subject: [PATCH 12/88] 
 https://github.com/yulichang/mybatis-plus-join/issues/84

---
 .../github/yulichang/kt/interfaces/Query.java | 13 +++---
 .../yulichang/toolkit/MPJReflectionKit.java   | 40 ++++++++++---------
 .../yulichang/wrapper/interfaces/Query.java   | 13 +++---
 .../test/join/dto/UserTenantDTO.java          | 16 ++++++++
 .../test/join/dto/UserTenantDescDTO.java      | 16 ++++++++
 .../test/join/LambdaWrapperTest.java          | 18 +++++++++
 6 files changed, 86 insertions(+), 30 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/dto/UserTenantDTO.java
 create mode 100644 mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/dto/UserTenantDescDTO.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
index 5b76e76..77c5a85 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
  *
  * @author yulichang
  */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "DuplicatedCode"})
 public interface Query<Children> extends Serializable {
 
 
@@ -129,11 +129,12 @@ public interface Query<Children> extends Serializable {
      * @return children
      */
     default Children selectAsClass(Class<?> source, Class<?> tag) {
-        List<SelectCache> normalList = ColumnCache.getListField(source);
-        Map<String, FieldCache> fieldMap = MPJReflectionKit.getFieldMap(tag);
-        for (SelectCache cache : normalList) {
-            if (fieldMap.containsKey(cache.getColumProperty())) {
-                getSelectColum().add(new SelectNormal(cache, getIndex(), isHasAlias(), getAlias()));
+        Map<String, SelectCache> normalMap = ColumnCache.getMapField(source);
+        List<FieldCache> fieldList = MPJReflectionKit.getFieldList(tag);
+        for (FieldCache cache : fieldList) {
+            if (normalMap.containsKey(cache.getField().getName())) {
+                SelectCache selectCache = normalMap.get(cache.getField().getName());
+                getSelectColum().add(new SelectNormal(selectCache, getIndex(), isHasAlias(), getAlias()));
             }
         }
         return getChildren();
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java
index 26ee29f..3276d5f 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java
@@ -8,11 +8,10 @@ import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 反射工具类
@@ -24,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public final class MPJReflectionKit {
 
     private static final Map<Class<?>, Map<String, FieldCache>> CLASS_FIELD_CACHE = new ConcurrentHashMap<>();
+    private static final Map<Class<?>, List<FieldCache>> CLASS_FIELD_LIST_CACHE = new ConcurrentHashMap<>();
 
     private static final Map<String, FieldCache> EMPTY_MAP = new HashMap<>();
 
@@ -77,28 +77,32 @@ public final class MPJReflectionKit {
      * @param clazz 反射类
      */
     public static Map<String, FieldCache> getFieldMap(Class<?> clazz) {
+        return CLASS_FIELD_CACHE.computeIfAbsent(clazz, key -> getFieldList(key).stream().collect(Collectors.toMap(f ->
+                f.getField().getName(), Function.identity())));
+    }
+
+    public static List<FieldCache> getFieldList(Class<?> clazz) {
         if (clazz == null) {
-            return EMPTY_MAP;
+            return Collections.emptyList();
         }
-        Map<String, FieldCache> fieldMap = CLASS_FIELD_CACHE.get(clazz);
-        if (fieldMap != null) {
-            return fieldMap;
+        List<FieldCache> fieldList = CLASS_FIELD_LIST_CACHE.get(clazz);
+        if (fieldList != null) {
+            return fieldList;
         }
-        Map<String, Field> map = ReflectionKit.getFieldMap(clazz);
-        Map<String, FieldCache> cache = new HashMap<>();
-        map.forEach((key, value) -> {
+        List<Field> list = ReflectionKit.getFieldList(clazz);
+        List<FieldCache> cache = list.stream().map(f -> {
             FieldCache fieldCache = new FieldCache();
-            fieldCache.setField(value);
+            fieldCache.setField(f);
             try {
                 Reflector reflector = new Reflector(clazz);
-                Class<?> getterType = reflector.getGetterType(key);
-                fieldCache.setType(Objects.isNull(getterType) ? value.getType() : getterType);
+                Class<?> getterType = reflector.getGetterType(f.getName());
+                fieldCache.setType(Objects.isNull(getterType) ? f.getType() : getterType);
             } catch (Throwable throwable) {
-                fieldCache.setType(value.getType());
+                fieldCache.setType(f.getType());
             }
-            cache.put(key, fieldCache);
-        });
-        CLASS_FIELD_CACHE.put(clazz, cache);
+            return fieldCache;
+        }).collect(Collectors.toList());
+        CLASS_FIELD_LIST_CACHE.put(clazz, cache);
         return cache;
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
index d393a14..f49f7be 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
  *
  * @author yulichang
  */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "DuplicatedCode"})
 public interface Query<Children> extends Serializable {
 
 
@@ -129,11 +129,12 @@ public interface Query<Children> extends Serializable {
      * @return children
      */
     default <E> Children selectAsClass(Class<E> source, Class<?> tag) {
-        List<SelectCache> normalList = ColumnCache.getListField(source);
-        Map<String, FieldCache> fieldMap = MPJReflectionKit.getFieldMap(tag);
-        for (SelectCache cache : normalList) {
-            if (fieldMap.containsKey(cache.getColumProperty())) {
-                getSelectColum().add(new SelectNormal(cache, getIndex(), isHasAlias(), getAlias()));
+        Map<String, SelectCache> normalMap = ColumnCache.getMapField(source);
+        List<FieldCache> fieldList = MPJReflectionKit.getFieldList(tag);
+        for (FieldCache cache : fieldList) {
+            if (normalMap.containsKey(cache.getField().getName())) {
+                SelectCache selectCache = normalMap.get(cache.getField().getName());
+                getSelectColum().add(new SelectNormal(selectCache, getIndex(), isHasAlias(), getAlias()));
             }
         }
         return getChildren();
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/dto/UserTenantDTO.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/dto/UserTenantDTO.java
new file mode 100644
index 0000000..1aa0b3c
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/dto/UserTenantDTO.java
@@ -0,0 +1,16 @@
+package com.github.yulichang.test.join.dto;
+
+
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString
+public class UserTenantDTO {
+
+    private Integer idea;
+
+    private Integer uuid;
+
+    private Integer tenantId;
+}
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/dto/UserTenantDescDTO.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/dto/UserTenantDescDTO.java
new file mode 100644
index 0000000..5f8945f
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/dto/UserTenantDescDTO.java
@@ -0,0 +1,16 @@
+package com.github.yulichang.test.join.dto;
+
+
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString
+public class UserTenantDescDTO {
+
+    private Integer tenantId;
+
+    private Integer uuid;
+
+    private Integer idea;
+}
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index df12348..c6a7f22 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.test.join.dto.AddressDTO;
 import com.github.yulichang.test.join.dto.UserDTO;
+import com.github.yulichang.test.join.dto.UserTenantDTO;
+import com.github.yulichang.test.join.dto.UserTenantDescDTO;
 import com.github.yulichang.test.join.entity.*;
 import com.github.yulichang.test.join.mapper.*;
 import com.github.yulichang.test.util.Reset;
@@ -59,6 +61,22 @@ class LambdaWrapperTest {
         Reset.reset();
     }
 
+    @Test
+    void testSelectSort(){
+        ThreadLocalUtils.set("SELECT t.id, t.user_id, t.tenant_id FROM user_tenant t WHERE t.tenant_id = 1");
+        MPJLambdaWrapper<UserTenantDO> lambda = JoinWrappers.lambda(UserTenantDO.class);
+        lambda.selectAsClass(UserTenantDO.class, UserTenantDTO.class);
+        List<UserTenantDO> list = userTenantMapper.selectJoinList(UserTenantDO.class,lambda);
+        assert list.size() == 5 && list.get(0).getIdea() != null;
+
+
+        ThreadLocalUtils.set("SELECT t.tenant_id, t.user_id, t.id FROM user_tenant t WHERE t.tenant_id = 1");
+        MPJLambdaWrapper<UserTenantDO> lambda1 = JoinWrappers.lambda(UserTenantDO.class);
+        lambda1.selectAsClass(UserTenantDO.class, UserTenantDescDTO.class);
+        List<UserTenantDO> list1 = userTenantMapper.selectJoinList(UserTenantDO.class,lambda1);
+        assert list1.size() == 5 && list1.get(0).getIdea() != null;
+    }
+
     @Test
     void testSimple() {
         MPJLambdaWrapper<UserTenantDO> lambda = JoinWrappers.lambda(UserTenantDO.class);

From c9e735522ceb27cebf12c5f1b4bbdad8baf3f2a5 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Thu, 2 Nov 2023 10:03:08 +0800
Subject: [PATCH 13/88] readme

---
 README-zh.md | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md    |   4 +-
 2 files changed, 165 insertions(+), 3 deletions(-)
 create mode 100644 README-zh.md

diff --git a/README-zh.md b/README-zh.md
new file mode 100644
index 0000000..261dc2d
--- /dev/null
+++ b/README-zh.md
@@ -0,0 +1,164 @@
+<!--suppress HtmlDeprecatedAttribute -->
+<p align="center">
+  <a href="https://github.com/yulichang/mybatis-plus-join" target="_blank">
+   <img alt="Mybatis-Plus-Join-Logo" src="https://mybatisplusjoin.com/lg.png">
+  </a>
+</p>
+<h1 align="center">MyBatis-Plus-Join</h1>
+<p align="center">
+  为简化开发工作、提高生产率而生
+</p>
+<p align="center">
+  <a href="https://github.com/yulichang/mybatis-plus-join" target="_blank">
+    <img src="https://img.shields.io/github/stars/yulichang/mybatis-plus-join.svg?style=social&label=Stars" alt=""/>
+  </a>
+  <a href="https://gitee.com/best_handsome/mybatis-plus-join" target="_blank">
+    <img src="https://gitee.com/best_handsome/mybatis-plus-join/badge/star.svg?theme=dark" alt=""/>
+  </a>
+  <br/>
+  <a href="https://central.sonatype.com/artifact/com.github.yulichang/mybatis-plus-join-boot-starter">
+    <img alt="maven" src="https://img.shields.io/maven-central/v/com.github.yulichang/mybatis-plus-join-boot-starter.svg?style=flat-square">
+  </a>
+
+  <a href="https://www.apache.org/licenses/LICENSE-2.0">
+    <img alt="code style" src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square">
+  </a>
+</p>
+<p align="center">
+对 <a href="https://gitee.com/baomidou/mybatis-plus" target="_blank">MyBatis-Plus</a> 多表查询的扩展 |
+<a href="https://gitee.com/best_handsome/mybatis-plus-join-demo" target="_blank">演示工程</a> |
+<a href="https://www.baidu.com/link?url=wdmhssysW-Mj19Gkcc2CBOzNVoimHat57mlnH78SEU_6y0awYgDKTBy7es9BXnAH&wd=&eqid=908484020001866e000000056440b5e3" target="_blank">使用文档</a> |
+点个Star支持一下吧 (☆▽☆)
+</p>
+
+<p align="center">
+QQ群:1022221898  或者 
+<a href="https://gitee.com/best_handsome/mybatis-plus-join/issues/I65N2M" target="_blank">添加作者微信，备注MPJ，加入微信群</a>  
+<br/>
+<img width="200px" height="200px" src="https://mybatisplusjoin.com/qr.png"  alt="添加作者微信，备注MPJ，加入微信群"/>
+</p>
+
+### <a href="https://www.baidu.com/link?url=6NtKqbGKUIIdwoBUaqNkQnLiG3d5y03L6Pfg6ODId0VKfPifpB1xqdQzsBprm-0h&wd=&eqid=d26e7f1600004777000000056440ade6" target="_blank">使用文档WIKI</a>
+
+## 使用方法
+
+### 安装
+
+- Maven
+  ```xml
+  <dependency>
+      <groupId>com.github.yulichang</groupId>
+      <artifactId>mybatis-plus-join-boot-starter</artifactId>
+      <version>1.4.7.2</version>
+  </dependency>
+  ```
+- Gradle
+  ```
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.7.1'
+  ```
+  或者clone代码到本地执行 mvn install, 再引入以上依赖  
+  <br>
+  注意: MyBatis Plus版本需要3.3.0+
+  <br>
+
+### 使用
+
+* mapper继承MPJBaseMapper (必选)
+* service继承MPJBaseService (可选)
+* serviceImpl继承MPJBaseServiceImpl (可选)
+
+### Lambda形式用法（MPJLambdaWrapper）
+
+#### 简单的连表查询
+
+```java
+class test {
+    @Resource
+    private UserMapper userMapper;
+
+    void testJoin() {
+        //和Mybatis plus一致，MPJLambdaWrapper的泛型必须是主表的泛型，并且要用主表的Mapper来调用
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)//查询user表全部字段
+                .select(UserAddressDO::getTel)//查询user_address tel 字段
+                .selectAs(UserAddressDO::getAddress, UserDTO::getUserAddress)//别名
+                .select(AreaDO::getProvince, AreaDO::getCity)
+                .leftJoin(UserAddressDO.class, UserAddressDO::getUserId, UserDO::getId)
+                .leftJoin(AreaDO.class, AreaDO::getId, UserAddressDO::getAreaId)
+                .eq(UserDO::getId, 1)
+                .like(UserAddressDO::getTel, "1")
+                .gt(UserDO::getId, 5);
+
+        //连表查询 返回自定义ResultType
+        List<UserDTO> list = userMapper.selectJoinList(UserDTO.class, wrapper);
+
+        //分页查询 （需要启用 mybatis plus 分页插件）
+        Page<UserDTO> listPage = userMapper.selectJoinPage(new Page<>(2, 10), UserDTO.class, wrapper);
+    }
+}
+```
+
+对应sql
+
+```
+SELECT  
+    t.id, t.name, t.sex, t.head_img, 
+    t1.tel, t1.address AS userAddress,
+    t2.province, t2.city 
+FROM 
+    user t 
+    LEFT JOIN user_address t1 ON t1.user_id = t.id 
+    LEFT JOIN area t2 ON t2.id = t1.area_id 
+WHERE (
+    t.id = ? 
+    AND t1.tel LIKE ? 
+    AND t.id > ?)
+```
+
+说明:
+
+* UserDTO.class 查询结果返回类(resultType)
+* selectAll() 查询指定实体类的全部字段
+* select() 查询指定的字段,支持可变参数,同一个select只能查询相同表的字段
+* selectAs() 字段别名查询,用于数据库字段与业务实体类属性名不一致时使用
+* leftJoin() 参数说明  
+  第一个参数:  参与连表的实体类class  
+  第二个参数:  连表的ON字段,这个属性必须是第一个参数实体类的属性  
+  第三个参数:  参与连表的ON的另一个实体类属性
+* 默认主表别名是t,其他的表别名以先后调用的顺序使用t1,t2,t3....
+* 条件查询,可以查询主表以及参与连接的所有表的字段,全部调用mp原生的方法,正常使用没有sql注入风险
+
+#### 一对多查询
+
+```java
+class test {
+    @Resource
+    private UserMapper userMapper;
+
+    @Test
+    void testResultMap() {
+        MPJLambdaWrapper<UserDO> wrapper = new MPJLambdaWrapper<>(User.class)
+                .selectAll(UserDO.class)
+                //对多查询
+                .selectCollection(AddressDO.class, UesrDTO::getAddressList)
+                //对一查询
+                .selectAssociation(AddressDO.class, UesrDTO::getAddress)
+                .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId);
+
+        List<UserDTO> dtoList = userMapper.selectJoinList(UserDTO.class, wrapper);
+
+        //关于对多分页查询
+        //由于嵌套结果方式会导致结果集被折叠，因此分页查询的结果在折叠后总数会减少，所以无法保证分页结果数量正确。
+    }
+}
+```
+
+MPJLambdaWrapper其他功能
+
+* <a href="https://mybatisplusjoin.com/pages/core/lambda/select/selectCollection.html" target="_blank">
+  一对一，一对多使用</a>
+* <a href="https://mybatisplusjoin.com/pages/core/lambda/select/selectFunc.html" target="_blank">简单的SQL函数使用</a>
+* <a href="https://mybatisplusjoin.com/pages/core/lambda/join/leftJoin.html" target="_blank">ON语句多条件支持</a>
+* <a href="https://www.baidu.com/link?url=wdmhssysW-Mj19Gkcc2CBOzNVoimHat57mlnH78SEU_6y0awYgDKTBy7es9BXnAH&wd=&eqid=908484020001866e000000056440b5e3" target="_blank">其他全部功能请参考使用文档</a>
+
+# <a href="https://www.baidu.com/link?url=wdmhssysW-Mj19Gkcc2CBOzNVoimHat57mlnH78SEU_6y0awYgDKTBy7es9BXnAH&wd=&eqid=908484020001866e000000056440b5e3" target="_blank">使用文档 wiki</a>
diff --git a/README.md b/README.md
index 9890240..1acaf01 100644
--- a/README.md
+++ b/README.md
@@ -33,9 +33,7 @@
 
 <p align="center">
 QQ群:1022221898  或者 
-<a href="https://gitee.com/best_handsome/mybatis-plus-join/issues/I65N2M" target="_blank">添加作者微信，备注MPJ，加入微信群</a>  
-<br/>
-<img width="200px" src="https://mybatisplusjoin.com/qr.png"  alt="添加作者微信，备注MPJ，加入微信群"/>
+<a href="https://gitee.com/best_handsome/mybatis-plus-join/issues/I65N2M" target="_blank">添加作者微信，备注MPJ，加入微信群</a>
 </p>
 
 ### <a href="https://www.baidu.com/link?url=6NtKqbGKUIIdwoBUaqNkQnLiG3d5y03L6Pfg6ODId0VKfPifpB1xqdQzsBprm-0h&wd=&eqid=d26e7f1600004777000000056440ade6" target="_blank">使用文档WIKI</a>

From 6a721e9dc00c35b34e07d73753e1c58dfd9ec19f Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Thu, 2 Nov 2023 10:04:35 +0800
Subject: [PATCH 14/88] readme

---
 README-zh.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README-zh.md b/README-zh.md
index 261dc2d..c8e4c5c 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -49,7 +49,7 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.7.2</version>
+      <version>1.4.7.1</version>
   </dependency>
   ```
 - Gradle

From 863ab1942e87d83bf7f278fd89e1b01abac9ab60 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 15 Nov 2023 20:22:54 +0800
Subject: [PATCH 15/88] =?UTF-8?q?pom=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis-plus-join-adapter-base/pom.xml    |  4 +-
 .../mybatis-plus-join-adapter-v33x/pom.xml    |  6 +--
 .../mybatis-plus-join-adapter-v3431/pom.xml   |  6 +--
 .../mybatis-plus-join-adapter-v352/pom.xml    |  4 +-
 mybatis-plus-join-adapter/pom.xml             | 12 +-----
 mybatis-plus-join-annotation/pom.xml          |  4 +-
 mybatis-plus-join-boot-starter/pom.xml        | 16 ++------
 mybatis-plus-join-core/pom.xml                | 22 +++--------
 mybatis-plus-join-extension/pom.xml           |  6 +--
 mybatis-plus-join-test/pom.xml                |  5 ++-
 mybatis-plus-join-test/test-base/pom.xml      |  4 +-
 .../test-collection/pom.xml                   |  4 +-
 mybatis-plus-join-test/test-join/pom.xml      | 13 ++++++-
 mybatis-plus-join-test/test-kotlin/pom.xml    |  4 +-
 mybatis-plus-join-test/test-mapping/pom.xml   |  4 +-
 .../test-springboot3-jdk17/pom.xml            |  4 +-
 mybatis-plus-join/pom.xml                     | 38 +++++++++++++++++--
 pom.xml                                       | 34 ++++++++++++++++-
 18 files changed, 118 insertions(+), 72 deletions(-)

diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
index 5d1415a..f3e8c2a 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-adapter</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>mybatis-plus-join-adapter-base</artifactId>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
     <name>mybatis-plus-join-adapter-base</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/pom.xml
index af5d43d..a1e2238 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-adapter</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>mybatis-plus-join-adapter-v33x</artifactId>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
     <name>mybatis-plus-join-adapter-v33x</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-base</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/pom.xml
index 01a9e3f..1e15545 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-adapter</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>mybatis-plus-join-adapter-v3431</artifactId>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
     <name>mybatis-plus-join-adapter-v3431</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-base</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v352/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v352/pom.xml
index 17c3240..6613bc5 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v352/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v352/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-adapter</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>mybatis-plus-join-adapter-v352</artifactId>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
     <name>mybatis-plus-join-adapter-v352</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
diff --git a/mybatis-plus-join-adapter/pom.xml b/mybatis-plus-join-adapter/pom.xml
index 2748f33..d0df29f 100644
--- a/mybatis-plus-join-adapter/pom.xml
+++ b/mybatis-plus-join-adapter/pom.xml
@@ -5,10 +5,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
     <packaging>pom</packaging>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
     <artifactId>mybatis-plus-join-adapter</artifactId>
     <name>mybatis-plus-join-adapter</name>
 
@@ -40,12 +40,4 @@
         <url>https://github.com/yulichang/mybatis-plus-join</url>
     </scm>
 
-    <properties>
-        <jdkVersion>1.8</jdkVersion>
-        <jdkVersion.test>1.8</jdkVersion.test>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <github.global.server>github</github.global.server>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
 </project>
diff --git a/mybatis-plus-join-annotation/pom.xml b/mybatis-plus-join-annotation/pom.xml
index ccc0e0f..c913b49 100644
--- a/mybatis-plus-join-annotation/pom.xml
+++ b/mybatis-plus-join-annotation/pom.xml
@@ -7,9 +7,9 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
     <artifactId>mybatis-plus-join-annotation</artifactId>
     <name>mybatis-plus-join-annotation</name>
 
diff --git a/mybatis-plus-join-boot-starter/pom.xml b/mybatis-plus-join-boot-starter/pom.xml
index 53457b4..b22265d 100644
--- a/mybatis-plus-join-boot-starter/pom.xml
+++ b/mybatis-plus-join-boot-starter/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--suppress ALL -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -7,9 +6,9 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
     <artifactId>mybatis-plus-join-boot-starter</artifactId>
     <name>mybatis-plus-join-boot-starter</name>
 
@@ -34,20 +33,11 @@
         <url>https://github.com/yulichang/mybatis-plus-join</url>
     </scm>
 
-    <properties>
-        <jdkVersion>1.8</jdkVersion>
-        <jdkVersion.test>1.8</jdkVersion.test>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <github.global.server>github</github.global.server>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-extension</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/mybatis-plus-join-core/pom.xml b/mybatis-plus-join-core/pom.xml
index f570f35..cfb8176 100644
--- a/mybatis-plus-join-core/pom.xml
+++ b/mybatis-plus-join-core/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--suppress VulnerableLibrariesLocal -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -7,9 +6,9 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
     <artifactId>mybatis-plus-join-core</artifactId>
     <name>mybatis-plus-join-core</name>
 
@@ -34,35 +33,26 @@
         <url>https://github.com/yulichang/mybatis-plus-join</url>
     </scm>
 
-    <properties>
-        <jdkVersion>1.8</jdkVersion>
-        <jdkVersion.test>1.8</jdkVersion.test>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <github.global.server>github</github.global.server>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-annotation</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-v33x</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-v3431</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-adapter-v352</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/mybatis-plus-join-extension/pom.xml b/mybatis-plus-join-extension/pom.xml
index dd5650a..3ba1294 100644
--- a/mybatis-plus-join-extension/pom.xml
+++ b/mybatis-plus-join-extension/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-root</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>mybatis-plus-join-extension</artifactId>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
     <name>mybatis-plus-join-extension</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-core</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index e8ac9ea..27cb2c0 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -13,7 +13,7 @@
     <groupId>com.github.yulichang</groupId>
     <artifactId>mybatis-plus-join-test</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
 
     <name>mybatis-plus-join-test</name>
 
@@ -56,6 +56,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <github.global.server>github</github.global.server>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <revision>1.4.7.2</revision>
     </properties>
 
     <dependencies>
@@ -82,7 +83,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/mybatis-plus-join-test/test-base/pom.xml b/mybatis-plus-join-test/test-base/pom.xml
index 1d229e8..a49d735 100644
--- a/mybatis-plus-join-test/test-base/pom.xml
+++ b/mybatis-plus-join-test/test-base/pom.xml
@@ -5,10 +5,10 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-test</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>test-base</artifactId>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
     <name>test-base</name>
 
     <description>test-base</description>
diff --git a/mybatis-plus-join-test/test-collection/pom.xml b/mybatis-plus-join-test/test-collection/pom.xml
index 70d5cb3..fdfa797 100644
--- a/mybatis-plus-join-test/test-collection/pom.xml
+++ b/mybatis-plus-join-test/test-collection/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-test</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 
diff --git a/mybatis-plus-join-test/test-join/pom.xml b/mybatis-plus-join-test/test-join/pom.xml
index 460f033..b810fcd 100644
--- a/mybatis-plus-join-test/test-join/pom.xml
+++ b/mybatis-plus-join-test/test-join/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-test</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,16 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.0.32</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/mybatis-plus-join-test/test-kotlin/pom.xml b/mybatis-plus-join-test/test-kotlin/pom.xml
index 56d681b..7ba0c34 100644
--- a/mybatis-plus-join-test/test-kotlin/pom.xml
+++ b/mybatis-plus-join-test/test-kotlin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.yulichang</groupId>
         <artifactId>mybatis-plus-join-test</artifactId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>test-kotlin</artifactId>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>com.mysql</groupId>
diff --git a/mybatis-plus-join-test/test-mapping/pom.xml b/mybatis-plus-join-test/test-mapping/pom.xml
index a751e70..f481a1c 100644
--- a/mybatis-plus-join-test/test-mapping/pom.xml
+++ b/mybatis-plus-join-test/test-mapping/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>mybatis-plus-join-test</artifactId>
         <groupId>com.github.yulichang</groupId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
index 23b1217..fbdd336 100644
--- a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
+++ b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>mybatis-plus-join-test</artifactId>
         <groupId>com.github.yulichang</groupId>
-        <version>1.4.7.1</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>test-base</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 
diff --git a/mybatis-plus-join/pom.xml b/mybatis-plus-join/pom.xml
index fad59a0..5925a3c 100644
--- a/mybatis-plus-join/pom.xml
+++ b/mybatis-plus-join/pom.xml
@@ -10,13 +10,13 @@
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.4.7.1</version>
+            <version>最新版本</version>
         </dependency>
     -->
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.yulichang</groupId>
     <artifactId>mybatis-plus-join</artifactId>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
     <name>mybatis-plus-join</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -47,13 +47,45 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <github.global.server>github</github.global.server>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <revision>1.4.7.2</revision>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-boot-starter</artifactId>
-            <version>1.4.7.1</version>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <configuration>
+                    <!-- 是否更新pom文件，此处还有更高级的用法 -->
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/pom.xml b/pom.xml
index a14c1d9..5b8e0d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.github.yulichang</groupId>
     <artifactId>mybatis-plus-join-root</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.7.1</version>
+    <version>${revision}</version>
     <name>mybatis-plus-join-root</name>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -45,5 +45,37 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <github.global.server>github</github.global.server>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <revision>1.4.7.2</revision>
     </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <configuration>
+                    <!-- 是否更新pom文件，此处还有更高级的用法 -->
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

From b6098167c6a0f279ceeceab7dfb2b684c2f96bba Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 15 Nov 2023 20:27:55 +0800
Subject: [PATCH 16/88] =?UTF-8?q?=E5=8D=87=E7=BA=A7MP=20->=203.5.4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis-plus-join-adapter-base/pom.xml                      | 2 +-
 mybatis-plus-join-boot-starter/pom.xml                          | 2 +-
 mybatis-plus-join-extension/pom.xml                             | 2 +-
 mybatis-plus-join-test/pom.xml                                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
index f3e8c2a..485295d 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.5.4</version>
+            <version>3.5.4.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/mybatis-plus-join-boot-starter/pom.xml b/mybatis-plus-join-boot-starter/pom.xml
index b22265d..dca2162 100644
--- a/mybatis-plus-join-boot-starter/pom.xml
+++ b/mybatis-plus-join-boot-starter/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.4</version>
+            <version>3.5.4.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/mybatis-plus-join-extension/pom.xml b/mybatis-plus-join-extension/pom.xml
index 3ba1294..dafd3bd 100644
--- a/mybatis-plus-join-extension/pom.xml
+++ b/mybatis-plus-join-extension/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.5.4</version>
+            <version>3.5.4.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index 27cb2c0..fc115aa 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.4</version>
+            <version>3.5.4.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

From 7c9e77f828ef4f52e29090b28a8b232df5cd51ef Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 15 Nov 2023 20:29:48 +0800
Subject: [PATCH 17/88] =?UTF-8?q?=E6=96=B0=E5=A2=9EtoChildren=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/github/yulichang/toolkit/Ref.java |  9 +++++++++
 .../yulichang/wrapper/MPJAbstractWrapper.java  | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/Ref.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/Ref.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/Ref.java
new file mode 100644
index 0000000..a890ca4
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/Ref.java
@@ -0,0 +1,9 @@
+package com.github.yulichang.toolkit;
+
+/**
+ * @author yulichang
+ * @since 1.4.7.2
+ */
+@SuppressWarnings("unused")
+public class Ref<T> {
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
index 768b9bb..78329a3 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
+import com.github.yulichang.toolkit.Ref;
 import com.github.yulichang.toolkit.TableList;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
 import com.github.yulichang.wrapper.enums.PrefixEnum;
@@ -24,6 +25,8 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 import static com.baomidou.mybatisplus.core.enums.SqlKeyword.*;
 import static com.baomidou.mybatisplus.core.enums.WrapperKeyword.APPLY;
@@ -141,6 +144,21 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
         return typedThis;
     }
 
+    /**
+     * 转为子类，方便自定义继承扩展
+     */
+    public <C extends Children> C toChildren(Ref<C> children) {
+        return (C) this;
+    }
+
+    /**
+     * 转为子类，方便自定义继承扩展
+     * 需要子类自定义字段
+     */
+    public <C extends Children> C toChildren(Supplier<C> s) {
+        return (C) this;
+    }
+
     /**
      * 开启检查 SQL 注入
      */

From 6e06a04fd9fed1a8e9913c4bdc6bcf7ae05d3a6b Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 15 Nov 2023 20:30:28 +0800
Subject: [PATCH 18/88] =?UTF-8?q?fix=20=E7=A7=BB=E9=99=A4union=20all?=
 =?UTF-8?q?=E6=B3=9B=E5=9E=8B=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/github/yulichang/wrapper/MPJLambdaWrapper.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index e3f8338..bdf1c8d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -245,8 +245,8 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     /**
      * union all
      */
-    @SafeVarargs
-    public final <E, F> MPJLambdaWrapper<T> unionAll(MPJLambdaWrapper<T>... wrappers) {
+    @SuppressWarnings("UnusedReturnValue")
+    public final MPJLambdaWrapper<T> unionAll(MPJLambdaWrapper<?>... wrappers) {
         StringBuilder sb = new StringBuilder();
         for (MPJLambdaWrapper<?> wrapper : wrappers) {
             addCustomWrapper(wrapper);

From 5251af216ef96c3ac1318af3b40cb4cef10d1282 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 15 Nov 2023 20:30:59 +0800
Subject: [PATCH 19/88] =?UTF-8?q?=E5=8D=87=E7=BA=A7MP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mybatis-plus-join-core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mybatis-plus-join-core/pom.xml b/mybatis-plus-join-core/pom.xml
index cfb8176..08d4e8a 100644
--- a/mybatis-plus-join-core/pom.xml
+++ b/mybatis-plus-join-core/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.5.4</version>
+            <version>3.5.4.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

From 5a7d561367157b8cb263edbdbadc085506ab2caf Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 15 Nov 2023 20:31:27 +0800
Subject: [PATCH 20/88] test

---
 .../test/join/LambdaWrapperTest.java          | 24 ++++++-
 .../test/join/m/CustomWrapperTest.java        | 63 +++++++++++++++++++
 2 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/CustomWrapperTest.java

diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index c6a7f22..752716b 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -62,18 +62,18 @@ class LambdaWrapperTest {
     }
 
     @Test
-    void testSelectSort(){
+    void testSelectSort() {
         ThreadLocalUtils.set("SELECT t.id, t.user_id, t.tenant_id FROM user_tenant t WHERE t.tenant_id = 1");
         MPJLambdaWrapper<UserTenantDO> lambda = JoinWrappers.lambda(UserTenantDO.class);
         lambda.selectAsClass(UserTenantDO.class, UserTenantDTO.class);
-        List<UserTenantDO> list = userTenantMapper.selectJoinList(UserTenantDO.class,lambda);
+        List<UserTenantDO> list = userTenantMapper.selectJoinList(UserTenantDO.class, lambda);
         assert list.size() == 5 && list.get(0).getIdea() != null;
 
 
         ThreadLocalUtils.set("SELECT t.tenant_id, t.user_id, t.id FROM user_tenant t WHERE t.tenant_id = 1");
         MPJLambdaWrapper<UserTenantDO> lambda1 = JoinWrappers.lambda(UserTenantDO.class);
         lambda1.selectAsClass(UserTenantDO.class, UserTenantDescDTO.class);
-        List<UserTenantDO> list1 = userTenantMapper.selectJoinList(UserTenantDO.class,lambda1);
+        List<UserTenantDO> list1 = userTenantMapper.selectJoinList(UserTenantDO.class, lambda1);
         assert list1.size() == 5 && list1.get(0).getIdea() != null;
     }
 
@@ -1134,4 +1134,22 @@ class LambdaWrapperTest {
 
         assert list.size() == 7;
     }
+
+    @Test
+    void unionAll() {
+        ThreadLocalUtils.set("SELECT t.id FROM `user` t WHERE t.del = false AND (t.id = ?) UNION ALL SELECT t.id FROM address t UNION ALL SELECT t.id FROM area t WHERE t.del = false AND (t.id = ?)");
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .select(UserDO::getId)
+                .eq(UserDO::getId, 1);
+        MPJLambdaWrapper<AddressDO> wrapper1 = JoinWrappers.lambda(AddressDO.class)
+                .select(AddressDO::getId)
+                .disableLogicDel();
+        MPJLambdaWrapper<AreaDO> wrapper2 = JoinWrappers.lambda(AreaDO.class)
+                .select(AreaDO::getId)
+                .eq(AreaDO::getId, 2);
+        wrapper.unionAll(wrapper1, wrapper2);
+        List<UserDO> list = wrapper.list();
+
+        assert list.size() == 23 && list.get(0).getId() != null;
+    }
 }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/CustomWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/CustomWrapperTest.java
new file mode 100644
index 0000000..7808b7f
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/CustomWrapperTest.java
@@ -0,0 +1,63 @@
+package com.github.yulichang.test.join.m;
+
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.join.mapper.UserMapper;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.toolkit.Ref;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+import java.util.Objects;
+
+@SpringBootTest
+public class CustomWrapperTest {
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+
+    //自定义wrapper扩展
+    public static class CWrapper<T> extends MPJLambdaWrapper<T> {
+
+        public static <T> CWrapper<T> toCWrapper() {
+            return null;
+        }
+
+        public <X> CWrapper<T> eqIfAbsent(SFunction<X, ?> column, Object val) {
+            super.eq(Objects.nonNull(val), column, val);
+            return this;
+        }
+    }
+
+    @Test
+    void testWrapperCustomer() {
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.id = ?)");
+        CWrapper<UserDO> wrapper = new CWrapper<UserDO>()
+                .selectAll(UserDO.class)
+//                .toChildren(new Ref<CWrapper<UserDO>>())
+                .toChildren(CWrapper::toCWrapper)
+                .eqIfAbsent(UserDO::getId, 1);
+        List<UserDO> dos = userMapper.selectList(wrapper);
+        dos.forEach(System.out::println);
+
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false");
+        CWrapper<UserDO> wrapper1 = new CWrapper<UserDO>()
+                .selectAll(UserDO.class)
+                .toChildren(new Ref<CWrapper<UserDO>>())
+//                .toChildren(CWrapper::toCWrapper)
+                .eqIfAbsent(UserDO::getId, null);
+        List<UserDO> dos1 = userMapper.selectList(wrapper1);
+        dos1.forEach(System.out::println);
+    }
+}

From 7ca1b4fad7422fa9fa1f564493c650b8e2876e54 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 15 Nov 2023 20:33:49 +0800
Subject: [PATCH 21/88] 1.4.7.2

---
 README-zh.md                                                  | 4 ++--
 README.md                                                     | 4 ++--
 .../com/github/yulichang/config/MPJInterceptorConfig.java     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index c8e4c5c..1d225fb 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -49,12 +49,12 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.7.1</version>
+      <version>1.4.7.2</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.7.1'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.7.2'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/README.md b/README.md
index 1acaf01..e49dc07 100644
--- a/README.md
+++ b/README.md
@@ -47,12 +47,12 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.7.1</version>
+      <version>1.4.7.2</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.7.1'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.7.2'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
index c1ea47b..b2853dc 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
@@ -30,7 +30,7 @@ public class MPJInterceptorConfig {
             System.out.println(" _ _   |_  _ _|_. ___ _ |    _  .  _  .  _  \n" +
                     "| | |\\/|_)(_| | |_\\  |_)||_|_\\  | (_) | | | \n" +
                     "     /               |          /\n" +
-                    "                                    1.4.7.1");
+                    "                                    1.4.7.2");
         }
     }
 

From 0269e57a170621d76d6e89b4ca59595ef2043c85 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 15 Nov 2023 22:44:36 +0800
Subject: [PATCH 22/88] =?UTF-8?q?pom=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis-plus-join-adapter-base/pom.xml    | 12 +------
 mybatis-plus-join-boot-starter/pom.xml        |  4 +--
 mybatis-plus-join-core/pom.xml                |  5 +--
 .../yulichang/injector/MPJSqlInjector.java    |  2 +-
 mybatis-plus-join-extension/pom.xml           |  3 +-
 mybatis-plus-join-test/pom.xml                |  8 +++--
 mybatis-plus-join/pom.xml                     |  3 +-
 pom.xml                                       | 35 +++++++++++++++++--
 8 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
index 485295d..f1f69ec 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
@@ -33,26 +33,16 @@
         <url>https://github.com/yulichang/mybatis-plus-join</url>
     </scm>
 
-    <properties>
-        <jdkVersion>1.8</jdkVersion>
-        <jdkVersion.test>1.8</jdkVersion.test>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <github.global.server>github</github.global.server>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.5.4.1</version>
+            <version>${mpj.mybatis.plus.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.28</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/mybatis-plus-join-boot-starter/pom.xml b/mybatis-plus-join-boot-starter/pom.xml
index dca2162..6da5532 100644
--- a/mybatis-plus-join-boot-starter/pom.xml
+++ b/mybatis-plus-join-boot-starter/pom.xml
@@ -43,18 +43,16 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
-            <version>2.7.5</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.4.1</version>
+            <version>${mpj.mybatis.plus.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.28</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/mybatis-plus-join-core/pom.xml b/mybatis-plus-join-core/pom.xml
index 08d4e8a..6a67863 100644
--- a/mybatis-plus-join-core/pom.xml
+++ b/mybatis-plus-join-core/pom.xml
@@ -57,25 +57,22 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.5.4.1</version>
+            <version>${mpj.mybatis.plus.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.28</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>5.3.29</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk8</artifactId>
-            <version>1.9.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java
index b51e61c..dba5c61 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java
@@ -56,7 +56,7 @@ public class MPJSqlInjector extends DefaultSqlInjector {
      * 升级到 mybatis plus 3.4.3.2 后对之前的版本兼容
      */
     @Deprecated
-    @SuppressWarnings({"unused", "DeprecatedIsStillUsed"})
+    @SuppressWarnings({"unused"})
     public List<AbstractMethod> getMethodList(Class<?> mapperClass) {
         if (VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.4.3.2") >= 0) {
             throw ExceptionUtils.mpe("DefaultSqlInjector 的 getMethodList(Class<?> mapperClass) 方法已在 3.4.3.2+ 改为" +
diff --git a/mybatis-plus-join-extension/pom.xml b/mybatis-plus-join-extension/pom.xml
index dafd3bd..52fafa0 100644
--- a/mybatis-plus-join-extension/pom.xml
+++ b/mybatis-plus-join-extension/pom.xml
@@ -51,13 +51,12 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.5.4.1</version>
+            <version>${mpj.mybatis.plus.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.28</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index fc115aa..f46b7e0 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -50,13 +50,15 @@
     </scm>
 
     <properties>
+        <revision>1.4.7.2</revision>
+        <mpj.mybatis.plus.version>3.5.4.1</mpj.mybatis.plus.version>
+
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <github.global.server>github</github.global.server>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <revision>1.4.7.2</revision>
     </properties>
 
     <dependencies>
@@ -78,7 +80,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.28</version>
+            <version>1.18.30</version>
         </dependency>
         <dependency>
             <groupId>com.github.yulichang</groupId>
@@ -93,7 +95,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.4.1</version>
+            <version>${mpj.mybatis.plus.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/mybatis-plus-join/pom.xml b/mybatis-plus-join/pom.xml
index 5925a3c..6b3d6ea 100644
--- a/mybatis-plus-join/pom.xml
+++ b/mybatis-plus-join/pom.xml
@@ -41,13 +41,14 @@
     </scm>
 
     <properties>
+        <revision>1.4.7.2</revision>
+
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <github.global.server>github</github.global.server>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <revision>1.4.7.2</revision>
     </properties>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 5b8e0d1..5f059c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,19 +35,50 @@
         <module>mybatis-plus-join-core</module>
         <module>mybatis-plus-join-annotation</module>
         <module>mybatis-plus-join-extension</module>
-        <module>mybatis-plus-join-test</module>
+<!--        <module>mybatis-plus-join-test</module>-->
     </modules>
 
     <properties>
+        <revision>1.4.7.2</revision>
+        <mpj.mybatis.plus.version>3.5.4.1</mpj.mybatis.plus.version>
+
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <github.global.server>github</github.global.server>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <revision>1.4.7.2</revision>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.30</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aop</artifactId>
+                <version>5.3.30</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib-jdk8</artifactId>
+                <version>1.9.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-configuration-processor</artifactId>
+                <optional>true</optional>
+                <version>2.7.17</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>

From 818fdb919179f10714eea79339b6587973434d18 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Thu, 16 Nov 2023 00:23:13 +0800
Subject: [PATCH 23/88] 1.4.7.2

---
 .../main/java/com/github/yulichang/injector/MPJSqlInjector.java | 2 +-
 .../java/com/github/yulichang/wrapper/MPJAbstractWrapper.java   | 1 -
 pom.xml                                                         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java
index dba5c61..b51e61c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java
@@ -56,7 +56,7 @@ public class MPJSqlInjector extends DefaultSqlInjector {
      * 升级到 mybatis plus 3.4.3.2 后对之前的版本兼容
      */
     @Deprecated
-    @SuppressWarnings({"unused"})
+    @SuppressWarnings({"unused", "DeprecatedIsStillUsed"})
     public List<AbstractMethod> getMethodList(Class<?> mapperClass) {
         if (VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.4.3.2") >= 0) {
             throw ExceptionUtils.mpe("DefaultSqlInjector 的 getMethodList(Class<?> mapperClass) 方法已在 3.4.3.2+ 改为" +
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
index 78329a3..84a669b 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
@@ -25,7 +25,6 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 import static com.baomidou.mybatisplus.core.enums.SqlKeyword.*;
diff --git a/pom.xml b/pom.xml
index 5f059c2..a737b3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
         <module>mybatis-plus-join-core</module>
         <module>mybatis-plus-join-annotation</module>
         <module>mybatis-plus-join-extension</module>
-<!--        <module>mybatis-plus-join-test</module>-->
+        <module>mybatis-plus-join-test</module>
     </modules>
 
     <properties>

From 064c0e3bd2a24927938bc6a97cf492102b29ce07 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Thu, 16 Nov 2023 01:56:27 +0800
Subject: [PATCH 24/88] fix
 https://github.com/yulichang/mybatis-plus-join/issues/91

---
 .../yulichang/toolkit/FieldStringMap.java     | 23 +++++++++++++++++++
 .../yulichang/toolkit/MPJReflectionKit.java   |  4 ++--
 .../toolkit/support/ColumnCache.java          | 12 ++++++----
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java
new file mode 100644
index 0000000..09003ec
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java
@@ -0,0 +1,23 @@
+package com.github.yulichang.toolkit;
+
+import java.util.HashMap;
+import java.util.Objects;
+
+/**
+ * @author yulichang
+ * @see HashMap
+ * @since 1.4.7.3
+ */
+public class FieldStringMap<V> extends HashMap<String, V> {
+
+    @Override
+    public V get(Object key) {
+        V v = super.get(key);
+        if (Objects.isNull(v)) {
+            String k = (String) key;
+            return entrySet().stream().filter(f -> k.equalsIgnoreCase(f.getKey())).findFirst()
+                    .map(Entry::getValue).orElse(null);
+        }
+        return v;
+    }
+}
\ No newline at end of file
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java
index 3276d5f..8c7f477 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
 @SuppressWarnings("unused")
 public final class MPJReflectionKit {
 
-    private static final Map<Class<?>, Map<String, FieldCache>> CLASS_FIELD_CACHE = new ConcurrentHashMap<>();
+    private static final Map<Class<?>, FieldStringMap<FieldCache>> CLASS_FIELD_CACHE = new ConcurrentHashMap<>();
     private static final Map<Class<?>, List<FieldCache>> CLASS_FIELD_LIST_CACHE = new ConcurrentHashMap<>();
 
     private static final Map<String, FieldCache> EMPTY_MAP = new HashMap<>();
@@ -78,7 +78,7 @@ public final class MPJReflectionKit {
      */
     public static Map<String, FieldCache> getFieldMap(Class<?> clazz) {
         return CLASS_FIELD_CACHE.computeIfAbsent(clazz, key -> getFieldList(key).stream().collect(Collectors.toMap(f ->
-                f.getField().getName(), Function.identity())));
+                f.getField().getName(), Function.identity(), (o, n) -> n, FieldStringMap::new)));
     }
 
     public static List<FieldCache> getFieldList(Class<?> clazz) {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java
index e4e09ea..220a503 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java
@@ -3,6 +3,7 @@ package com.github.yulichang.toolkit.support;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.toolkit.Asserts;
+import com.github.yulichang.toolkit.FieldStringMap;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.wrapper.segments.SelectCache;
 
@@ -23,7 +24,7 @@ public class ColumnCache {
 
     private static final Map<Class<?>, List<SelectCache>> LIST_CACHE = new ConcurrentHashMap<>();
 
-    private static final Map<Class<?>, Map<String, SelectCache>> MAP_CACHE = new ConcurrentHashMap<>();
+    private static final Map<Class<?>, FieldStringMap<SelectCache>> MAP_CACHE = new ConcurrentHashMap<>();
 
     public static List<SelectCache> getListField(Class<?> clazz) {
         return LIST_CACHE.computeIfAbsent(clazz, c -> {
@@ -31,14 +32,17 @@ public class ColumnCache {
             Asserts.hasTable(tableInfo, c);
             List<SelectCache> list = new ArrayList<>();
             if (ConfigProperties.tableInfoAdapter.mpjHasPK(tableInfo)) {
-                list.add(new SelectCache(clazz, true, tableInfo.getKeyColumn(), tableInfo.getKeyType(), tableInfo.getKeyProperty(), null));
+                list.add(new SelectCache(clazz, true, tableInfo.getKeyColumn(), tableInfo.getKeyType(),
+                        tableInfo.getKeyProperty(), null));
             }
-            list.addAll(tableInfo.getFieldList().stream().map(f -> new SelectCache(clazz, false, f.getColumn(), f.getPropertyType(), f.getProperty(), f)).collect(Collectors.toList()));
+            list.addAll(tableInfo.getFieldList().stream().map(f -> new SelectCache(clazz, false, f.getColumn(),
+                    f.getPropertyType(), f.getProperty(), f)).collect(Collectors.toList()));
             return list;
         });
     }
 
     public static Map<String, SelectCache> getMapField(Class<?> clazz) {
-        return MAP_CACHE.computeIfAbsent(clazz, c -> getListField(c).stream().collect(Collectors.toMap(SelectCache::getColumProperty, Function.identity(), (i, j) -> j)));
+        return MAP_CACHE.computeIfAbsent(clazz, c -> getListField(c).stream().collect(Collectors.toMap(
+                SelectCache::getColumProperty, Function.identity(), (i, j) -> j, FieldStringMap::new)));
     }
 }

From ab27be7f817c761461d27871fcd2e7e7c62d2431 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Thu, 16 Nov 2023 20:29:41 +0800
Subject: [PATCH 25/88] fix
 https://github.com/yulichang/mybatis-plus-join/issues/92

---
 .../java/com/github/yulichang/interceptor/MPJInterceptor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
index 696d21a..3d7bf01 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
@@ -427,7 +427,7 @@ public class MPJInterceptor implements Interceptor {
     public Object plugin(Object target) {
         try {
             return Interceptor.super.plugin(target);
-        } catch (Exception e) {
+        } catch (Throwable e) {
             return Plugin.wrap(target, this);
         }
     }

From 40006863f6cbaaef0904e8757b68bbfb5a03d423 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 17 Nov 2023 04:18:01 +0800
Subject: [PATCH 26/88] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitee/ISSUE_TEMPLATE.zh-CN.md        | 15 +++++++++++++++
 .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md | 15 +++++++++++++++
 .github/ISSUE_TEMPLATE.zh-CN          | 15 +++++++++++++++
 .github/PULL_REQUEST_TEMPLATE.zh-CN   | 15 +++++++++++++++
 .github/dependabot.yml                | 11 +++++++++++
 5 files changed, 71 insertions(+)
 create mode 100644 .gitee/ISSUE_TEMPLATE.zh-CN.md
 create mode 100644 .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
 create mode 100644 .github/ISSUE_TEMPLATE.zh-CN
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.zh-CN
 create mode 100644 .github/dependabot.yml

diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md
new file mode 100644
index 0000000..59a9fc0
--- /dev/null
+++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md
@@ -0,0 +1,15 @@
+### 当前使用版本(必填,否则不予处理)
+
+
+
+### 该问题是如何引起的？(确定最新版也有问题再提!!!)
+
+
+
+### 重现步骤(如果有就写完整)
+
+
+
+### 报错信息
+
+
diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
new file mode 100644
index 0000000..061a184
--- /dev/null
+++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
@@ -0,0 +1,15 @@
+### 该Pull Request关联的Issue
+
+
+
+### 修改描述
+
+
+
+### 测试用例
+
+
+
+### 修复效果的截屏
+
+
diff --git a/.github/ISSUE_TEMPLATE.zh-CN b/.github/ISSUE_TEMPLATE.zh-CN
new file mode 100644
index 0000000..59a9fc0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.zh-CN
@@ -0,0 +1,15 @@
+### 当前使用版本(必填,否则不予处理)
+
+
+
+### 该问题是如何引起的？(确定最新版也有问题再提!!!)
+
+
+
+### 重现步骤(如果有就写完整)
+
+
+
+### 报错信息
+
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.zh-CN b/.github/PULL_REQUEST_TEMPLATE.zh-CN
new file mode 100644
index 0000000..061a184
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.zh-CN
@@ -0,0 +1,15 @@
+### 该Pull Request关联的Issue
+
+
+
+### 修改描述
+
+
+
+### 测试用例
+
+
+
+### 修复效果的截屏
+
+
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..14fc3a4
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

From 7b33070fa46ec9d043c171a2e9379e771a0dceca Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 17 Nov 2023 06:54:58 +0800
Subject: [PATCH 27/88] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/toolkit/FieldStringMap.java     | 15 +++---
 .../github/yulichang/toolkit/LambdaUtils.java | 18 ++-----
 .../yulichang/toolkit/MPJReflectionKit.java   |  2 +-
 .../toolkit/support/ColumnCache.java          |  4 +-
 .../extension/mapping/relation/Relation.java  | 11 ++---
 .../yulichang/test/join/entity/AreaDO.java    |  2 +-
 .../yulichang/test/join/m/FieldNameTest.java  | 47 +++++++++++++++++++
 7 files changed, 68 insertions(+), 31 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/FieldNameTest.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java
index 09003ec..51d6f5a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java
@@ -1,7 +1,7 @@
 package com.github.yulichang.toolkit;
 
 import java.util.HashMap;
-import java.util.Objects;
+import java.util.Locale;
 
 /**
  * @author yulichang
@@ -12,12 +12,11 @@ public class FieldStringMap<V> extends HashMap<String, V> {
 
     @Override
     public V get(Object key) {
-        V v = super.get(key);
-        if (Objects.isNull(v)) {
-            String k = (String) key;
-            return entrySet().stream().filter(f -> k.equalsIgnoreCase(f.getKey())).findFirst()
-                    .map(Entry::getValue).orElse(null);
-        }
-        return v;
+        return super.get(((String) key).toUpperCase(Locale.ENGLISH));
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return super.containsKey(((String) key).toUpperCase(Locale.ENGLISH));
     }
 }
\ No newline at end of file
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LambdaUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LambdaUtils.java
index 4d12ebe..4b2cffd 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LambdaUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LambdaUtils.java
@@ -2,32 +2,24 @@ package com.github.yulichang.toolkit;
 
 
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.github.yulichang.toolkit.support.*;
+import com.github.yulichang.toolkit.support.IdeaProxyLambdaMeta;
+import com.github.yulichang.toolkit.support.LambdaMeta;
+import com.github.yulichang.toolkit.support.ReflectLambdaMeta;
+import com.github.yulichang.toolkit.support.ShadowLambdaMeta;
 import org.apache.ibatis.reflection.property.PropertyNamer;
 
 import java.lang.invoke.SerializedLambda;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.util.Map;
 
 /**
  * copy {@link com.baomidou.mybatisplus.core.toolkit.LambdaUtils}
  */
-@SuppressWarnings("unused")
 public final class LambdaUtils {
 
     public static <T> String getName(SFunction<T, ?> fn) {
         LambdaMeta extract = extract(fn);
-        String name = PropertyNamer.methodToProperty(extract.getImplMethodName());
-        if (Character.isUpperCase(name.charAt(0))) {
-            Map<String, FieldCache> map = MPJReflectionKit.getFieldMap(extract.getInstantiatedClass());
-            if (map.containsKey(name)) {
-                return name;
-            } else {
-                return map.keySet().stream().filter(i -> i.equalsIgnoreCase(name)).findFirst().orElse(null);
-            }
-        }
-        return name;
+        return PropertyNamer.methodToProperty(extract.getImplMethodName());
     }
 
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java
index 8c7f477..cfefb68 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJReflectionKit.java
@@ -78,7 +78,7 @@ public final class MPJReflectionKit {
      */
     public static Map<String, FieldCache> getFieldMap(Class<?> clazz) {
         return CLASS_FIELD_CACHE.computeIfAbsent(clazz, key -> getFieldList(key).stream().collect(Collectors.toMap(f ->
-                f.getField().getName(), Function.identity(), (o, n) -> n, FieldStringMap::new)));
+                f.getField().getName().toUpperCase(Locale.ENGLISH), Function.identity(), (o, n) -> n, FieldStringMap::new)));
     }
 
     public static List<FieldCache> getFieldList(Class<?> clazz) {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java
index 220a503..214e037 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java
@@ -9,6 +9,7 @@ import com.github.yulichang.wrapper.segments.SelectCache;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
@@ -43,6 +44,7 @@ public class ColumnCache {
 
     public static Map<String, SelectCache> getMapField(Class<?> clazz) {
         return MAP_CACHE.computeIfAbsent(clazz, c -> getListField(c).stream().collect(Collectors.toMap(
-                SelectCache::getColumProperty, Function.identity(), (i, j) -> j, FieldStringMap::new)));
+                i -> i.getColumProperty().toUpperCase(Locale.ENGLISH),
+                Function.identity(), (i, j) -> j, FieldStringMap::new)));
     }
 }
diff --git a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/relation/Relation.java b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/relation/Relation.java
index cda9dca..86375ad 100644
--- a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/relation/Relation.java
+++ b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/relation/Relation.java
@@ -11,10 +11,7 @@ import com.github.yulichang.extension.mapping.mapper.MPJTableInfoHelper;
 import com.github.yulichang.extension.mapping.wrapper.MappingQuery;
 import com.github.yulichang.toolkit.LambdaUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @SuppressWarnings("unchecked")
@@ -80,10 +77,10 @@ public class Relation {
         MPJTableInfo tableInfo = MPJTableInfoHelper.getTableInfo(entityClass);
         if (tableInfo.isHasMappingOrField()) {
             boolean hasProperty = CollectionUtils.isNotEmpty(config.getProperty());
-            List<String> listProperty = hasProperty ? config.getProperty().stream().map(LambdaUtils::getName).collect(
-                    Collectors.toList()) : null;
+            List<String> listProperty = hasProperty ? config.getProperty().stream().map(i ->
+                    LambdaUtils.getName(i).toUpperCase(Locale.ENGLISH)).collect(Collectors.toList()) : null;
             for (MPJTableFieldInfo fieldInfo : tableInfo.getFieldList()) {
-                if (!hasProperty || listProperty.contains(fieldInfo.getProperty())) {
+                if (!hasProperty || listProperty.contains(fieldInfo.getProperty().toUpperCase(Locale.ENGLISH))) {
                     List<Object> itemList = data.stream().map(fieldInfo::thisFieldGet).collect(Collectors.toList());
                     if (CollectionUtils.isNotEmpty(itemList)) {
                         List<?> joinList = MappingQuery.mpjQueryList(fieldInfo.getJoinMapper(), SqlKeyword.IN,
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/AreaDO.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/AreaDO.java
index fcc3272..ca6252b 100644
--- a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/AreaDO.java
+++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/entity/AreaDO.java
@@ -26,7 +26,7 @@ public class AreaDO implements Serializable {
 
     private String area;
 
-    private String postcode;
+    private String Postcode;
 
     @TableLogic
     private Boolean del;
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/FieldNameTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/FieldNameTest.java
new file mode 100644
index 0000000..1ac9467
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/FieldNameTest.java
@@ -0,0 +1,47 @@
+package com.github.yulichang.test.join.m;
+
+import com.github.yulichang.test.join.dto.AreaDTO;
+import com.github.yulichang.test.join.entity.AreaDO;
+import com.github.yulichang.test.join.entity.UserDto;
+import com.github.yulichang.test.join.mapper.AreaMapper;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.toolkit.JoinWrappers;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+@SpringBootTest
+public class FieldNameTest {
+
+    @Autowired
+    private AreaMapper areaMapper;
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+
+    @Test
+    void testFieldName() {
+        List<AreaDO> list = areaMapper.selectJoinList(AreaDO.class, JoinWrappers.lambda(AreaDO.class)
+                .select(AreaDO::getPostcode)
+                .leftJoin(UserDto.class,UserDto::getId,AreaDO::getId));
+
+        list.forEach(System.out::println);
+        assert list.get(0).getPostcode() != null;
+    }
+
+    @Test
+    void testFieldName1() {
+        List<AreaDTO> list = areaMapper.selectJoinList(AreaDTO.class, JoinWrappers.lambda(AreaDO.class)
+                .selectAs(AreaDO::getPostcode,AreaDTO::getPostcode)
+                .leftJoin(UserDto.class,UserDto::getId,AreaDO::getId));
+
+        list.forEach(System.out::println);
+        assert list.get(0).getPostcode() != null;
+    }
+}

From 630c320cd322ee866a3d165a32e4770e7679d33c Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 17 Nov 2023 07:19:52 +0800
Subject: [PATCH 28/88] =?UTF-8?q?sql=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/github/yulichang/method/DeleteJoin.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/DeleteJoin.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/DeleteJoin.java
index 0548e55..332fcb9 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/DeleteJoin.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/DeleteJoin.java
@@ -31,13 +31,13 @@ public class DeleteJoin extends MPJAbstractMethod {
         if (AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo)) {
             String sql = String.format(sqlMethod.getSql(), sqlFirst(), mpjTableName(tableInfo), sqlAlias(), sqlFrom(),
                     mpjDeleteLogic(tableInfo), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
-            SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
+            SqlSource sqlSource = languageDriver.createSqlSource(configuration, removeExtraWhitespaces(sql), modelClass);
             return this.addUpdateMappedStatement(mapperClass, modelClass, sqlMethod.getMethod(), sqlSource);
         } else {
             sqlMethod = SqlMethod.DELETE_JOIN;
             String sql = String.format(sqlMethod.getSql(), sqlFirst(), mpjDelete(), mpjTableName(tableInfo),
                     sqlAlias(), sqlFrom(), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
-            SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
+            SqlSource sqlSource = languageDriver.createSqlSource(configuration, removeExtraWhitespaces(sql), modelClass);
             return this.addDeleteMappedStatement(mapperClass, sqlMethod.getMethod(), sqlSource);
         }
     }

From aa0f9e87bf66e99eebde7fa9af2b3e29a9bc81ee Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 17 Nov 2023 23:41:14 +0800
Subject: [PATCH 29/88] =?UTF-8?q?fix=20selectSub=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=8A=A5=E9=94=99=E5=92=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?union?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/kt/KtAbstractWrapper.java       | 18 +++-
 .../github/yulichang/kt/KtLambdaWrapper.java  | 97 ++++++++++++++-----
 .../yulichang/toolkit/KtWrapperUtils.java     |  7 +-
 .../yulichang/wrapper/MPJAbstractWrapper.java |  1 -
 .../yulichang/wrapper/MPJLambdaWrapper.java   | 86 ++++++++++++----
 .../test/join/LambdaWrapperTest.java          | 65 -------------
 .../yulichang/test/join/m/SelectSubTest.java  | 51 ++++++++++
 .../yulichang/test/join/m/UnionTest.java      | 85 ++++++++++++++++
 .../github/yulichang/test/kt/KtApplication.kt |  0
 .../yulichang/test/kt/dto/AddressDTO.kt       |  0
 .../github/yulichang/test/kt/dto/AreaDTO.kt   | 12 +++
 .../github/yulichang/test/kt/dto/UserDTO.kt   |  0
 .../yulichang/test/kt/entity/AddressDO.kt     |  0
 .../test/kt/entity/AddressGeneric.kt          |  0
 .../github/yulichang/test/kt/entity/AreaDO.kt |  2 +-
 .../com/github/yulichang/test/kt/entity/ID.kt |  0
 .../yulichang/test/kt/entity/OrderDO.kt       |  0
 .../github/yulichang/test/kt/entity/UserDO.kt |  0
 .../yulichang/test/kt/entity/UserDto.kt       |  0
 .../yulichang/test/kt/entity/UserTTT.kt       |  0
 .../com/github/yulichang/test/kt/enums/Sex.kt |  0
 .../yulichang/test/kt/mapper/AddressMapper.kt |  0
 .../yulichang/test/kt/mapper/AreaMapper.kt    |  0
 .../yulichang/test/kt/mapper/MyBaseMapper.kt  |  0
 .../yulichang/test/kt/mapper/OrderMapper.kt   |  0
 .../yulichang/test/kt/mapper/UserDTOMapper.kt |  0
 .../yulichang/test/kt/mapper/UserMapper.kt    |  0
 .../yulichang/test/kt/service/UserService.kt  |  0
 .../test/kt/service/impl/UserServiceImpl.kt   |  0
 .../github/yulichang/test/kt/dto/AreaDTO.kt   | 12 ---
 .../yulichang/test/kt/LambdaWrapperTest.kt    | 71 ++------------
 .../yulichang/test/kt/m/CustomWrapperTest.kt  | 57 +++++++++++
 .../yulichang/test/kt/m/FieldNameTest.kt      | 41 ++++++++
 .../yulichang/test/kt/m/SelectSubTest.kt      | 53 ++++++++++
 .../github/yulichang/test/kt/m/UnionTest.kt   | 83 ++++++++++++++++
 35 files changed, 554 insertions(+), 187 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/SelectSubTest.java
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/UnionTest.java
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/KtApplication.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/dto/AddressDTO.kt (100%)
 create mode 100644 mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/dto/AreaDTO.kt
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/dto/UserDTO.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/entity/AddressDO.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/entity/AddressGeneric.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/entity/AreaDO.kt (93%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/entity/ID.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/entity/OrderDO.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/entity/UserDO.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/entity/UserDto.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/entity/UserTTT.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/enums/Sex.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/mapper/AddressMapper.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/mapper/AreaMapper.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/mapper/MyBaseMapper.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/mapper/OrderMapper.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/mapper/UserDTOMapper.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/mapper/UserMapper.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/service/UserService.kt (100%)
 rename mybatis-plus-join-test/test-kotlin/src/main/{kotlin => java}/com/github/yulichang/test/kt/service/impl/UserServiceImpl.kt (100%)
 delete mode 100644 mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/dto/AreaDTO.kt
 rename mybatis-plus-join-test/test-kotlin/src/test/{ => java}/com/github/yulichang/test/kt/LambdaWrapperTest.kt (94%)
 create mode 100644 mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt
 create mode 100644 mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/FieldNameTest.kt
 create mode 100644 mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/SelectSubTest.kt
 create mode 100644 mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/UnionTest.kt

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
index 2c0f733..f4299ff 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
@@ -16,6 +16,7 @@ import com.github.yulichang.kt.interfaces.Func;
 import com.github.yulichang.kt.interfaces.OnCompare;
 import com.github.yulichang.toolkit.KtUtils;
 import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
+import com.github.yulichang.toolkit.Ref;
 import com.github.yulichang.toolkit.TableList;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
 import com.github.yulichang.wrapper.enums.PrefixEnum;
@@ -29,6 +30,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import static com.baomidou.mybatisplus.core.enums.SqlKeyword.*;
 import static com.baomidou.mybatisplus.core.enums.WrapperKeyword.APPLY;
@@ -146,6 +148,21 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         return typedThis;
     }
 
+    /**
+     * 转为子类，方便自定义继承扩展
+     */
+    public <C extends Children> C toChildren(Ref<C> children) {
+        return (C) this;
+    }
+
+    /**
+     * 转为子类，方便自定义继承扩展
+     * 需要子类自定义字段
+     */
+    public <C extends Children> C toChildren(Supplier<C> s) {
+        return (C) this;
+    }
+
     /**
      * 开启检查 SQL 注入
      */
@@ -670,7 +687,6 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      */
     public Children setParamAlias(String paramAlias) {
         Assert.notEmpty(paramAlias, "paramAlias can not be empty!");
-        Assert.isNull(this.paramAlias.getStringValue(), "Please do not call the method repeatedly!");
         this.paramAlias.setStringValue(paramAlias);
         return typedThis;
     }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
index 96b800b..26e8a25 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.kt.interfaces.Query;
 import com.github.yulichang.kt.interfaces.QueryLabel;
-import com.github.yulichang.toolkit.Constant;
-import com.github.yulichang.toolkit.KtUtils;
-import com.github.yulichang.toolkit.KtWrapperUtils;
-import com.github.yulichang.toolkit.TableList;
+import com.github.yulichang.toolkit.*;
 import com.github.yulichang.toolkit.support.ColumnCache;
 import com.github.yulichang.wrapper.interfaces.Chain;
 import com.github.yulichang.wrapper.interfaces.SelectWrapper;
@@ -31,7 +28,7 @@ import java.util.stream.Collectors;
  * @author yulichang
  * @since 1.4.6
  */
-@SuppressWarnings({"unused", "unchecked", "rawtypes"})
+@SuppressWarnings({"unused", "unchecked", "rawtypes", "DuplicatedCode"})
 public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapper<T>> implements
         Query<KtLambdaWrapper<T>>, QueryLabel<KtLambdaWrapper<T>>, Chain<T>, SelectWrapper<T, KtLambdaWrapper<T>> {
 
@@ -205,11 +202,12 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
     /**
      * 子查询
      */
-    @SuppressWarnings("DuplicatedCode")
-    public KtLambdaWrapper<T> selectSub(Class<?> clazz, String st, Consumer<KtLambdaWrapper<?>> consumer, KProperty<?> alias) {
-        KtLambdaWrapper<?> wrapper = new KtLambdaWrapper(null, clazz, SharedString.emptyString(), paramNameSeq, paramNameValuePairs,
-                new MergeSegments(), SharedString.emptyString(), this.paramAlias, SharedString.emptyString(), SharedString.emptyString(),
-                new TableList(), null, null, null, null) {
+    public KtLambdaWrapper<T> selectSub(Class<?> clazz, String st,
+                                        Consumer<KtLambdaWrapper<?>> consumer, KProperty<?> alias) {
+        KtLambdaWrapper<?> wrapper = new KtLambdaWrapper(null, clazz, SharedString.emptyString(), paramNameSeq,
+                paramNameValuePairs, new MergeSegments(), new SharedString(this.paramAlias.getStringValue()),
+                SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(), new TableList(),
+                null, null, null, null) {
         };
         wrapper.tableList.setAlias(st);
         wrapper.tableList.setRootClass(clazz);
@@ -218,22 +216,29 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
         wrapper.subTableAlias = st;
         consumer.accept(wrapper);
         addCustomWrapper(wrapper);
-        this.selectColumns.add(new SelectSub(() -> KtWrapperUtils.buildSubSqlByWrapper(clazz, wrapper, alias.getName()), hasAlias, this.alias));
+        this.selectColumns.add(new SelectSub(() -> KtWrapperUtils.buildSubSqlByWrapper(
+                clazz, wrapper, alias.getName()), hasAlias, this.alias));
         return typedThis;
     }
 
     /**
      * union
+     * <p>
+     * 推荐使用 union(Class<U> clazz, Consumer<MPJLambdaWrapper<U>> consumer)
+     * 例： wrapper.union(UserDO.class, union -> union.selectAll(UserDO.class))
+     *
+     * @see #union(Class, Consumer)
+     * @deprecated union 不支持子查询
      */
-    @SuppressWarnings("UnusedReturnValue")
+    @Deprecated
+    @SuppressWarnings("DeprecatedIsStillUsed")
     public final KtLambdaWrapper<T> union(KtLambdaWrapper<?>... wrappers) {
         StringBuilder sb = new StringBuilder();
         for (KtLambdaWrapper<?> wrapper : wrappers) {
             addCustomWrapper(wrapper);
             Class<?> entityClass = wrapper.getEntityClass();
             Assert.notNull(entityClass, "请使用 new MPJLambdaWrapper(主表.class) 或 JoinWrappers.lambda(主表.class) 构造方法");
-            sb.append(" UNION ")
-                    .append(KtWrapperUtils.buildUnionSqlByWrapper(entityClass, wrapper));
+            sb.append(" UNION ").append(KtWrapperUtils.buildUnionSqlByWrapper(entityClass, wrapper));
         }
         if (Objects.isNull(unionSql)) {
             unionSql = SharedString.emptyString();
@@ -243,17 +248,45 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
     }
 
     /**
-     * union all
+     * union
+     * <p>
+     * 例： wrapper.union(UserDO.class, union -> union.selectAll(UserDO.class))
+     *
+     * @param clazz union语句的主表类型
+     * @since 1.4.7.3
      */
-    @SafeVarargs
-    public final <E, F> KtLambdaWrapper<T> unionAll(KtLambdaWrapper<T>... wrappers) {
+    public <U> KtLambdaWrapper<T> union(Class<U> clazz, Consumer<KtLambdaWrapper<U>> consumer) {
+        KtLambdaWrapper<U> unionWrapper = KtWrappers.query(clazz);
+        addCustomWrapper(unionWrapper);
+        consumer.accept(unionWrapper);
+
+        String sb = " UNION " + KtWrapperUtils.buildUnionSqlByWrapper(clazz, unionWrapper);
+
+        if (Objects.isNull(unionSql)) {
+            unionSql = SharedString.emptyString();
+        }
+        unionSql.setStringValue(unionSql.getStringValue() + sb);
+        return typedThis;
+    }
+
+    /**
+     * union
+     * <p>
+     * 推荐使用 unionAll(Class<U> clazz, Consumer<MPJLambdaWrapper<U>> consumer)
+     * 例： wrapper.unionAll(UserDO.class, union -> union.selectAll(UserDO.class))
+     *
+     * @see #unionAll(Class, Consumer)
+     * @deprecated union 不支持子查询
+     */
+    @Deprecated
+    @SuppressWarnings("DeprecatedIsStillUsed")
+    public final KtLambdaWrapper<T> unionAll(KtLambdaWrapper<?>... wrappers) {
         StringBuilder sb = new StringBuilder();
         for (KtLambdaWrapper<?> wrapper : wrappers) {
             addCustomWrapper(wrapper);
             Class<?> entityClass = wrapper.getEntityClass();
             Assert.notNull(entityClass, "请使用 new MPJLambdaWrapper(主表.class) 或 JoinWrappers.lambda(主表.class) 构造方法");
-            sb.append(" UNION ALL ")
-                    .append(KtWrapperUtils.buildUnionSqlByWrapper(entityClass, wrapper));
+            sb.append(" UNION ALL ").append(KtWrapperUtils.buildUnionSqlByWrapper(entityClass, wrapper));
         }
         if (Objects.isNull(unionSql)) {
             unionSql = SharedString.emptyString();
@@ -262,7 +295,28 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
         return typedThis;
     }
 
-    @SuppressWarnings("DuplicatedCode")
+    /**
+     * union
+     * <p>
+     * 例： wrapper.unionAll(UserDO.class, union -> union.selectAll(UserDO.class))
+     *
+     * @param clazz union语句的主表类型
+     * @since 1.4.7.3
+     */
+    public <U> KtLambdaWrapper<T> unionAll(Class<U> clazz, Consumer<KtLambdaWrapper<U>> consumer) {
+        KtLambdaWrapper<U> unionWrapper = KtWrappers.query(clazz);
+        addCustomWrapper(unionWrapper);
+        consumer.accept(unionWrapper);
+
+        String sb = " UNION ALL " + KtWrapperUtils.buildUnionSqlByWrapper(clazz, unionWrapper);
+
+        if (Objects.isNull(unionSql)) {
+            unionSql = SharedString.emptyString();
+        }
+        unionSql.setStringValue(unionSql.getStringValue() + sb);
+        return typedThis;
+    }
+
     private void addCustomWrapper(KtLambdaWrapper<?> wrapper) {
         if (Objects.isNull(wrapperIndex)) {
             wrapperIndex = new AtomicInteger(0);
@@ -280,7 +334,6 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
      * 查询条件 SQL 片段
      */
     @Override
-    @SuppressWarnings("DuplicatedCode")
     public String getSqlSelect() {
         if (StringUtils.isBlank(sqlSelect.getStringValue()) && CollectionUtils.isNotEmpty(selectColumns)) {
             String s = selectColumns.stream().map(i -> {
@@ -349,7 +402,7 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
     @Override
     protected KtLambdaWrapper<T> instance(Integer index, String keyWord, Class<?> joinClass, String tableName) {
         return new KtLambdaWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs,
-                new MergeSegments(), SharedString.emptyString(), this.paramAlias, SharedString.emptyString(), SharedString.emptyString(),
+                new MergeSegments(), this.paramAlias, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
                 this.tableList, index, keyWord, joinClass, tableName);
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
index 4a3a96b..242fb92 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
@@ -16,9 +16,9 @@ import java.util.Optional;
  * @author yulichang
  * @since 1.4.6
  */
+@SuppressWarnings("DuplicatedCode")
 public class KtWrapperUtils {
 
-    @SuppressWarnings("DuplicatedCode")
     public static String buildSubSqlByWrapper(Class<?> clazz, KtLambdaWrapper<?> wrapper, String alias) {
         TableInfo tableInfo = TableHelper.get(clazz);
         Asserts.hasTable(tableInfo, clazz);
@@ -53,7 +53,6 @@ public class KtWrapperUtils {
                 alias);
     }
 
-    @SuppressWarnings("DuplicatedCode")
     public static String buildUnionSqlByWrapper(Class<?> clazz, KtLambdaWrapper<?> wrapper) {
         TableInfo tableInfo = TableHelper.get(clazz);
         Asserts.hasTable(tableInfo, clazz);
@@ -94,7 +93,6 @@ public class KtWrapperUtils {
         return SqlScriptUtils.safeParam(paramStr, null);
     }
 
-    @SuppressWarnings("DuplicatedCode")
     private static String getEntitySql(TableInfo tableInfo, KtLambdaWrapper<?> wrapper) {
         Object obj = wrapper.getEntity();
         if (Objects.isNull(obj)) {
@@ -126,6 +124,9 @@ public class KtWrapperUtils {
     }
 
     private static String mainLogic(boolean hasWhere, Class<?> clazz, KtLambdaWrapper<?> wrapper) {
+        if (!wrapper.getLogicSql()) {
+            return StringPool.EMPTY;
+        }
         String info = LogicInfoUtils.getLogicInfo(null, clazz, true, wrapper.getAlias());
         if (StringUtils.isNotBlank(info)) {
             if (hasWhere) {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
index 84a669b..442978d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
@@ -700,7 +700,6 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      */
     public Children setParamAlias(String paramAlias) {
         Assert.notEmpty(paramAlias, "paramAlias can not be empty!");
-        Assert.isTrue(StringUtils.isBlank(this.paramAlias.getStringValue()), "Please do not call the method repeatedly!");
         this.paramAlias.setStringValue(paramAlias);
         return typedThis;
     }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index bdf1c8d..3898ee5 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.toolkit.Constant;
 import com.github.yulichang.toolkit.LambdaUtils;
-import com.github.yulichang.toolkit.TableList;
-import com.github.yulichang.toolkit.WrapperUtils;
+import com.github.yulichang.toolkit.*;
 import com.github.yulichang.toolkit.support.ColumnCache;
 import com.github.yulichang.wrapper.interfaces.Chain;
 import com.github.yulichang.wrapper.interfaces.Query;
@@ -30,7 +28,7 @@ import java.util.stream.Collectors;
  *
  * @author yulichang
  */
-@SuppressWarnings({"unused"})
+@SuppressWarnings({"unused", "DuplicatedCode"})
 public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWrapper<T>> implements
         Query<MPJLambdaWrapper<T>>, QueryLabel<MPJLambdaWrapper<T>>, Chain<T>, SelectWrapper<T, MPJLambdaWrapper<T>> {
 
@@ -205,10 +203,10 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     /**
      * 子查询
      */
-    @SuppressWarnings("DuplicatedCode")
     public <E, F> MPJLambdaWrapper<T> selectSub(Class<E> clazz, String st, Consumer<MPJLambdaWrapper<E>> consumer, SFunction<F, ?> alias) {
-        MPJLambdaWrapper<E> wrapper = new MPJLambdaWrapper<E>(null, clazz, SharedString.emptyString(), paramNameSeq, paramNameValuePairs,
-                new MergeSegments(), this.paramAlias, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
+        MPJLambdaWrapper<E> wrapper = new MPJLambdaWrapper<E>(null, clazz, SharedString.emptyString(),
+                paramNameSeq, paramNameValuePairs, new MergeSegments(), new SharedString(this.paramAlias
+                .getStringValue()), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
                 new TableList(), null, null, null, null) {
         };
         wrapper.tableList.setAlias(st);
@@ -224,16 +222,22 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
 
     /**
      * union
+     * <p>
+     * 推荐使用 union(Class<U> clazz, Consumer<MPJLambdaWrapper<U>> consumer)
+     * 例： wrapper.union(UserDO.class, union -> union.selectAll(UserDO.class))
+     *
+     * @see #union(Class, Consumer)
+     * @deprecated union 不支持子查询
      */
-    @SuppressWarnings("UnusedReturnValue")
+    @Deprecated
+    @SuppressWarnings({"UnusedReturnValue", "DeprecatedIsStillUsed"})
     public final MPJLambdaWrapper<T> union(MPJLambdaWrapper<?>... wrappers) {
         StringBuilder sb = new StringBuilder();
         for (MPJLambdaWrapper<?> wrapper : wrappers) {
             addCustomWrapper(wrapper);
             Class<?> entityClass = wrapper.getEntityClass();
             Assert.notNull(entityClass, "请使用 new MPJLambdaWrapper(主表.class) 或 JoinWrappers.lambda(主表.class) 构造方法");
-            sb.append(" UNION ")
-                    .append(WrapperUtils.buildUnionSqlByWrapper(entityClass, wrapper));
+            sb.append(" UNION ").append(WrapperUtils.buildUnionSqlByWrapper(entityClass, wrapper));
         }
         if (Objects.isNull(unionSql)) {
             unionSql = SharedString.emptyString();
@@ -243,17 +247,45 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     }
 
     /**
-     * union all
+     * union
+     * <p>
+     * 例： wrapper.union(UserDO.class, union -> union.selectAll(UserDO.class))
+     *
+     * @param clazz union语句的主表类型
+     * @since 1.4.7.3
      */
-    @SuppressWarnings("UnusedReturnValue")
-    public final MPJLambdaWrapper<T> unionAll(MPJLambdaWrapper<?>... wrappers) {
+    public <U> MPJLambdaWrapper<T> union(Class<U> clazz, Consumer<MPJLambdaWrapper<U>> consumer) {
+        MPJLambdaWrapper<U> unionWrapper = JoinWrappers.lambda(clazz);
+        addCustomWrapper(unionWrapper);
+        consumer.accept(unionWrapper);
+
+        String sb = " UNION " + WrapperUtils.buildUnionSqlByWrapper(clazz, unionWrapper);
+
+        if (Objects.isNull(unionSql)) {
+            unionSql = SharedString.emptyString();
+        }
+        unionSql.setStringValue(unionSql.getStringValue() + sb);
+        return typedThis;
+    }
+
+    /**
+     * union
+     * <p>
+     * 推荐使用 unionAll(Class<U> clazz, Consumer<MPJLambdaWrapper<U>> consumer)
+     * 例： wrapper.unionAll(UserDO.class, union -> union.selectAll(UserDO.class))
+     *
+     * @see #unionAll(Class, Consumer)
+     * @deprecated union 不支持子查询
+     */
+    @Deprecated
+    @SuppressWarnings("DeprecatedIsStillUsed")
+    public MPJLambdaWrapper<T> unionAll(MPJLambdaWrapper<?>... wrappers) {
         StringBuilder sb = new StringBuilder();
         for (MPJLambdaWrapper<?> wrapper : wrappers) {
             addCustomWrapper(wrapper);
             Class<?> entityClass = wrapper.getEntityClass();
             Assert.notNull(entityClass, "请使用 new MPJLambdaWrapper(主表.class) 或 JoinWrappers.lambda(主表.class) 构造方法");
-            sb.append(" UNION ALL ")
-                    .append(WrapperUtils.buildUnionSqlByWrapper(entityClass, wrapper));
+            sb.append(" UNION ALL ").append(WrapperUtils.buildUnionSqlByWrapper(entityClass, wrapper));
         }
         if (Objects.isNull(unionSql)) {
             unionSql = SharedString.emptyString();
@@ -262,7 +294,28 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
         return typedThis;
     }
 
-    @SuppressWarnings("DuplicatedCode")
+    /**
+     * union
+     * <p>
+     * 例： wrapper.unionAll(UserDO.class, union -> union.selectAll(UserDO.class))
+     *
+     * @param clazz union语句的主表类型
+     * @since 1.4.7.3
+     */
+    public <U> MPJLambdaWrapper<T> unionAll(Class<U> clazz, Consumer<MPJLambdaWrapper<U>> consumer) {
+        MPJLambdaWrapper<U> unionWrapper = JoinWrappers.lambda(clazz);
+        addCustomWrapper(unionWrapper);
+        consumer.accept(unionWrapper);
+
+        String sb = " UNION ALL " + WrapperUtils.buildUnionSqlByWrapper(clazz, unionWrapper);
+
+        if (Objects.isNull(unionSql)) {
+            unionSql = SharedString.emptyString();
+        }
+        unionSql.setStringValue(unionSql.getStringValue() + sb);
+        return typedThis;
+    }
+
     private void addCustomWrapper(MPJLambdaWrapper<?> wrapper) {
         if (Objects.isNull(wrapperIndex)) {
             wrapperIndex = new AtomicInteger(0);
@@ -280,7 +333,6 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
      * 查询条件 SQL 片段
      */
     @Override
-    @SuppressWarnings("DuplicatedCode")
     public String getSqlSelect() {
         if (StringUtils.isBlank(sqlSelect.getStringValue()) && CollectionUtils.isNotEmpty(selectColumns)) {
             String s = selectColumns.stream().map(i -> {
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index 752716b..c6cbb4e 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -1074,30 +1074,6 @@ class LambdaWrapperTest {
         }
     }
 
-    /**
-     * select 子查询
-     */
-    @Test
-    void sub() {
-        ThreadLocalUtils.set("SELECT (SELECT st.id FROM `user` st WHERE st.del = false AND (st.id = t.id) LIMIT 1) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del = false AND t1.del = false AND (t.id <= ?)");
-        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
-                .selectSub(UserDO.class, w -> w.select(UserDO::getId)
-                        .eq(UserDO::getId, UserDO::getId)
-                        .last("limit 1"), UserDO::getId)
-                .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId)
-                .le(UserDO::getId, 100);
-        wrapper.list();
-
-        ThreadLocalUtils.set("SELECT (SELECT st.id FROM area st WHERE st.del = false AND (st.id = t1.id) LIMIT 1) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del = false AND t1.del = false AND (t.id <= ?)");
-        MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
-                .selectSub(AreaDO.class, w -> w.select(AreaDO::getId)
-                        .eq(AreaDO::getId, AddressDO::getId)
-                        .last("limit 1"), UserDO::getId)
-                .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId)
-                .le(UserDO::getId, 100);
-        wrapper1.list();
-    }
-
     /**
      * select 子查询
      */
@@ -1111,45 +1087,4 @@ class LambdaWrapperTest {
                 .orderByDesc("t.id");
         wrapper.list();
     }
-
-    /**
-     * select 子查询
-     */
-    @Test
-    void union() {
-        ThreadLocalUtils.set("SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t WHERE t.del=false AND (t.id = ?) UNION SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t WHERE (t.`name` = ? AND (t.`name` = ?)) UNION SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t WHERE t.del=false AND (t.pid = ?)");
-        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
-                .selectAll(UserDO.class)
-                .eq(UserDO::getId, 1);
-        MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
-                .selectAll(UserDO.class)
-                .disableLogicDel()
-                .eq(UserDO::getName, "张三 2")
-                .and(w -> w.eq(UserDO::getName, "张三 2"));
-        MPJLambdaWrapper<UserDO> wrapper2 = JoinWrappers.lambda(UserDO.class)
-                .selectAll(UserDO.class)
-                .eq(UserDO::getPid, 2);
-        wrapper.union(wrapper1, wrapper2);
-        List<UserDO> list = wrapper.list();
-
-        assert list.size() == 7;
-    }
-
-    @Test
-    void unionAll() {
-        ThreadLocalUtils.set("SELECT t.id FROM `user` t WHERE t.del = false AND (t.id = ?) UNION ALL SELECT t.id FROM address t UNION ALL SELECT t.id FROM area t WHERE t.del = false AND (t.id = ?)");
-        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
-                .select(UserDO::getId)
-                .eq(UserDO::getId, 1);
-        MPJLambdaWrapper<AddressDO> wrapper1 = JoinWrappers.lambda(AddressDO.class)
-                .select(AddressDO::getId)
-                .disableLogicDel();
-        MPJLambdaWrapper<AreaDO> wrapper2 = JoinWrappers.lambda(AreaDO.class)
-                .select(AreaDO::getId)
-                .eq(AreaDO::getId, 2);
-        wrapper.unionAll(wrapper1, wrapper2);
-        List<UserDO> list = wrapper.list();
-
-        assert list.size() == 23 && list.get(0).getId() != null;
-    }
 }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/SelectSubTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/SelectSubTest.java
new file mode 100644
index 0000000..6eaef3e
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/SelectSubTest.java
@@ -0,0 +1,51 @@
+package com.github.yulichang.test.join.m;
+
+import com.github.yulichang.test.join.entity.AddressDO;
+import com.github.yulichang.test.join.entity.AreaDO;
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class SelectSubTest {
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+
+    /**
+     * select 子查询
+     */
+    @Test
+    void sub() {
+        ThreadLocalUtils.set("SELECT (SELECT st.id FROM `user` st WHERE st.del = false AND (st.id = t.id AND st.id = ?) LIMIT 1) AS id, (SELECT st.id FROM `user` st WHERE st.del = false AND (st.id = t.id AND st.id = ?) LIMIT 1) AS name FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del = false AND t1.del = false AND (t.id <= ?)");
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .selectSub(UserDO.class, w -> w.select(UserDO::getId)
+                        .eq(UserDO::getId, UserDO::getId)
+                        .eq(UserDO::getId, 2)
+                        .last("limit 1"), UserDO::getId)
+                .selectSub(UserDO.class, w -> w.select(UserDO::getId)
+                        .eq(UserDO::getId, UserDO::getId)
+                        .eq(UserDO::getId, 3)
+                        .last("limit 1"), UserDO::getName)
+                .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId)
+                .le(UserDO::getId, 100);
+        wrapper.list();
+
+        ThreadLocalUtils.set("SELECT (SELECT st.id FROM area st WHERE st.del = false AND (st.id = t1.id) LIMIT 1) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del = false AND t1.del = false AND (t.id <= ?)");
+        MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
+                .selectSub(AreaDO.class, w -> w.select(AreaDO::getId)
+                        .eq(AreaDO::getId, AddressDO::getId)
+                        .last("limit 1"), UserDO::getId)
+                .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId)
+                .le(UserDO::getId, 100);
+        wrapper1.list();
+    }
+}
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/UnionTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/UnionTest.java
new file mode 100644
index 0000000..cc968aa
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/UnionTest.java
@@ -0,0 +1,85 @@
+package com.github.yulichang.test.join.m;
+
+import com.github.yulichang.test.join.entity.AddressDO;
+import com.github.yulichang.test.join.entity.AreaDO;
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+@SuppressWarnings("deprecation")
+@SpringBootTest
+public class UnionTest {
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+
+    @Test
+    void union() {
+        ThreadLocalUtils.set("SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t WHERE t.del=false AND (t.id = ?) UNION SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t WHERE (t.`name` = ? AND (t.`name` = ?)) UNION SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t WHERE t.del=false AND (t.pid = ?)");
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .eq(UserDO::getId, 1);
+        MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .disableLogicDel()
+                .eq(UserDO::getName, "张三 2")
+                .and(w -> w.eq(UserDO::getName, "张三 2"));
+        MPJLambdaWrapper<UserDO> wrapper2 = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .eq(UserDO::getPid, 2);
+        wrapper.union(wrapper1, wrapper2);
+        List<UserDO> list = wrapper.list();
+
+        System.out.println(wrapper.getUnionSql());
+        assert list.size() == 7 && list.get(0).getId() != null;
+    }
+
+    @Test
+    void unionAll() {
+        ThreadLocalUtils.set("SELECT t.id FROM `user` t WHERE t.del = false AND (t.id = ?) UNION ALL SELECT t.id FROM address t UNION ALL SELECT t.id FROM area t WHERE t.del = false AND (t.id = ?)");
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .select(UserDO::getId)
+                .eq(UserDO::getId, 1);
+        MPJLambdaWrapper<AddressDO> wrapper1 = JoinWrappers.lambda(AddressDO.class)
+                .select(AddressDO::getId)
+                .disableLogicDel();
+        MPJLambdaWrapper<AreaDO> wrapper2 = JoinWrappers.lambda(AreaDO.class)
+                .select(AreaDO::getId)
+                .eq(AreaDO::getId, 2);
+        wrapper.unionAll(wrapper1, wrapper2);
+        List<UserDO> list = wrapper.list();
+
+        assert list.size() == 23 && list.get(0).getId() != null;
+    }
+
+    @Test
+    void unionAll1() {
+        ThreadLocalUtils.set("SELECT t.id FROM `user` t WHERE t.del = false AND (t.id = ?) UNION ALL SELECT t.id FROM address t WHERE (t.id = ?) UNION ALL SELECT (SELECT st.id FROM area st WHERE st.del = false AND (st.id = ? AND (st.id = ?))) AS id FROM area t WHERE t.del = false AND (t.id = ? AND (t.id = ?))");
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .select(UserDO::getId)
+                .eq(UserDO::getId, 1)
+                .unionAll(AddressDO.class, union -> union
+                        .select(AddressDO::getId)
+                        .disableLogicDel()
+                        .eq(UserDO::getId, 2))
+                .unionAll(AreaDO.class, union -> union
+                        .selectSub(AreaDO.class, sub -> sub
+                                .select(AreaDO::getId)
+                                .eq(AreaDO::getId, 3)
+                                .and(and -> and.eq(AreaDO::getId, 4)), AreaDO::getId)
+                        .eq(AreaDO::getId, 5)
+                        .and(and -> and.eq(AreaDO::getId, 6)));
+        List<UserDO> list = wrapper.list();
+        assert list.size() == 2 && list.get(0).getId() != null;
+    }
+}
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/KtApplication.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/KtApplication.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/KtApplication.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/KtApplication.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/dto/AddressDTO.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/dto/AddressDTO.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/dto/AddressDTO.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/dto/AddressDTO.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/dto/AreaDTO.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/dto/AreaDTO.kt
new file mode 100644
index 0000000..3468fd4
--- /dev/null
+++ b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/dto/AreaDTO.kt
@@ -0,0 +1,12 @@
+package com.github.yulichang.test.kt.dto
+
+
+@Suppress("unused")
+class AreaDTO {
+    val id: Int? = null
+    val province: String? = null
+    val city: String? = null
+    val area: String? = null
+    val postcode: String? = null
+    val del: Boolean? = null
+}
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/dto/UserDTO.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/dto/UserDTO.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/dto/UserDTO.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/dto/UserDTO.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/AddressDO.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/AddressDO.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/AddressDO.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/AddressDO.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/AddressGeneric.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/AddressGeneric.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/AddressGeneric.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/AddressGeneric.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/AreaDO.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/AreaDO.kt
similarity index 93%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/AreaDO.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/AreaDO.kt
index cf8f01c..16f06f3 100644
--- a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/AreaDO.kt
+++ b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/AreaDO.kt
@@ -13,7 +13,7 @@ class AreaDO : Serializable {
     var province: String? = null
     var city: String? = null
     var area: String? = null
-    var postcode: String? = null
+    var Postcode: String? = null
 
     @TableLogic
     var del: Boolean? = null
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/ID.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/ID.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/ID.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/ID.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/OrderDO.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/OrderDO.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/OrderDO.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/OrderDO.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/UserDO.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/UserDO.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/UserDO.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/UserDO.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/UserDto.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/UserDto.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/UserDto.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/UserDto.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/UserTTT.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/UserTTT.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/entity/UserTTT.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/UserTTT.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/enums/Sex.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/enums/Sex.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/enums/Sex.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/enums/Sex.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/mapper/AddressMapper.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/mapper/AddressMapper.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/mapper/AddressMapper.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/mapper/AddressMapper.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/mapper/AreaMapper.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/mapper/AreaMapper.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/mapper/AreaMapper.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/mapper/AreaMapper.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/mapper/MyBaseMapper.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/mapper/MyBaseMapper.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/mapper/MyBaseMapper.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/mapper/MyBaseMapper.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/mapper/OrderMapper.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/mapper/OrderMapper.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/mapper/OrderMapper.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/mapper/OrderMapper.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/mapper/UserDTOMapper.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/mapper/UserDTOMapper.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/mapper/UserDTOMapper.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/mapper/UserDTOMapper.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/mapper/UserMapper.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/mapper/UserMapper.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/mapper/UserMapper.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/mapper/UserMapper.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/service/UserService.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/service/UserService.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/service/UserService.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/service/UserService.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/service/impl/UserServiceImpl.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/service/impl/UserServiceImpl.kt
similarity index 100%
rename from mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/service/impl/UserServiceImpl.kt
rename to mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/service/impl/UserServiceImpl.kt
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/dto/AreaDTO.kt b/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/dto/AreaDTO.kt
deleted file mode 100644
index e847f5b..0000000
--- a/mybatis-plus-join-test/test-kotlin/src/main/kotlin/com/github/yulichang/test/kt/dto/AreaDTO.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.yulichang.test.kt.dto
-
-
-@Suppress("unused")
-class AreaDTO {
-    private val id: Int? = null
-    private val province: String? = null
-    private val city: String? = null
-    private val area: String? = null
-    private val postcode: String? = null
-    private val del: Boolean? = null
-}
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/com/github/yulichang/test/kt/LambdaWrapperTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/LambdaWrapperTest.kt
similarity index 94%
rename from mybatis-plus-join-test/test-kotlin/src/test/com/github/yulichang/test/kt/LambdaWrapperTest.kt
rename to mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/LambdaWrapperTest.kt
index 43b61de..1be531a 100644
--- a/mybatis-plus-join-test/test-kotlin/src/test/com/github/yulichang/test/kt/LambdaWrapperTest.kt
+++ b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/LambdaWrapperTest.kt
@@ -698,7 +698,9 @@ class LambdaWrapperTest {
                 .eq(UserDO::name, "ref")
         userMapper!!.selectList(wrapper)
         try {
-            userMapper.insertBatchSomeColumn(ArrayList())
+            val arr = ArrayList<UserDO>()
+            arr.add(UserDO())
+            userMapper.insertBatchSomeColumn(arr)
         } catch (ignored: BadSqlGrammarException) {
         }
     }
@@ -821,7 +823,9 @@ class LambdaWrapperTest {
                 .setTableName { name -> name + "bbbbbbb" }
         try {
             userMapper!!.selectJoinList(UserDTO::class.java, wrapper)
-        } catch (_: BadSqlGrammarException) {
+        } catch (a: Exception) {
+            if (a.message!!.contains("sql error"))
+                throw a
         }
     }
 
@@ -1092,67 +1096,4 @@ class LambdaWrapperTest {
             //忽略异常 h2不支持连表删除
         }
     }
-
-    /**
-     * select 子查询
-     */
-    @Test
-    fun sub() {
-        ThreadLocalUtils.set("SELECT ( SELECT st.id FROM `user` st WHERE st.del=false AND (st.id = t.id) limit 1 ) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t.id <= ?)")
-        val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-                .selectSub(
-                        UserDO::class.java, { w ->
-                    w.select(UserDO::id)
-                            .eq(UserDO::id, UserDO::id)
-                            .last("limit 1")
-                }, UserDO::id
-                )
-                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-                .le(UserDO::id, 100)
-        wrapper.list()
-
-        ThreadLocalUtils.set("SELECT ( SELECT st.id FROM area st WHERE st.del=false AND (st.id = t1.id) limit 1 ) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t.id <= ?)")
-        val wrapper1: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-                .selectSub(AreaDO::class.java, { w ->
-                    w.select(AreaDO::id)
-                            .eq(AreaDO::id, AddressDO::id)
-                            .last("limit 1")
-                }, UserDO::id)
-                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-                .le(UserDO::id, 100)
-        wrapper1.list()
-
-        ThreadLocalUtils.set("SELECT ( SELECT st.id FROM address st WHERE st.del=false AND (st.id = t1.id) limit 1 ) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del=false AND t1.del=false AND (t.id <= ?)")
-        val wrapper2: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-                .selectSub(AddressDO::class.java, { w ->
-                    w.select(AddressDO::id)
-                            .eq(AddressDO::id, AddressDO::id)
-                            .last("limit 1")
-                }, UserDO::id)
-                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
-                .le(UserDO::id, 100)
-        wrapper2.list()
-    }
-
-
-    /**
-     * select 子查询
-     */
-    @Test
-    fun union() {
-        val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-                .selectAll(UserDO::class.java)
-                .eq(UserDO::id, 1)
-        val wrapper1: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-                .selectAll(UserDO::class.java)
-                .eq(UserDO::name, "张三 2")
-                .and { a -> a.eq(UserDO::name, "张三 2") }
-        val wrapper2: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
-                .selectAll(UserDO::class.java)
-                .eq(UserDO::pid, 2)
-
-        wrapper.union(wrapper1, wrapper2)
-        val list = wrapper.list()
-        assert(list.size == 7)
-    }
 }
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt
new file mode 100644
index 0000000..e0f0b9c
--- /dev/null
+++ b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt
@@ -0,0 +1,57 @@
+package com.github.yulichang.test.kt.m
+
+import com.github.yulichang.kt.KtLambdaWrapper
+import com.github.yulichang.test.kt.entity.UserDO
+import com.github.yulichang.test.kt.mapper.UserMapper
+import com.github.yulichang.test.util.Reset
+import com.github.yulichang.test.util.ThreadLocalUtils
+import com.github.yulichang.toolkit.Ref
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+import java.util.*
+import kotlin.reflect.KProperty
+
+@SpringBootTest
+class CustomWrapperTest {
+    @Autowired
+    private val userMapper: UserMapper? = null
+
+    @BeforeEach
+    fun setUp() {
+        Reset.reset()
+    }
+
+    //自定义wrapper扩展
+    class CWrapper<T> : KtLambdaWrapper<T>() {
+        fun eqIfAbsent(column: KProperty<*>, `val`: Any?): CWrapper<T> {
+            super.eq(Objects.nonNull(`val`), column, `val`)
+            return this
+        }
+
+        companion object {
+            fun <T> toCWrapper(): CWrapper<T>? {
+                return null
+            }
+        }
+    }
+
+    @Test
+    fun testWrapperCustomer() {
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.id = ?)")
+        val wrapper: CWrapper<UserDO> = CWrapper<UserDO>()
+                .selectAll(UserDO::class.java)
+                .toChildren<CWrapper<UserDO>> { CWrapper.toCWrapper() }
+                .eqIfAbsent(UserDO::id, 1)
+        val dos = userMapper?.selectList(wrapper)
+        dos?.forEach(System.out::println)
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false")
+        val wrapper1: CWrapper<UserDO> = CWrapper<UserDO>()
+                .selectAll(UserDO::class.java)
+                .toChildren(Ref<CWrapper<UserDO>>())
+                .eqIfAbsent(UserDO::id, null)
+        val dos1 = userMapper?.selectList(wrapper1)
+        dos1?.forEach(System.out::println)
+    }
+}
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/FieldNameTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/FieldNameTest.kt
new file mode 100644
index 0000000..6c026eb
--- /dev/null
+++ b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/FieldNameTest.kt
@@ -0,0 +1,41 @@
+package com.github.yulichang.test.kt.m
+
+import com.github.yulichang.test.kt.dto.AreaDTO
+import com.github.yulichang.test.kt.entity.AreaDO
+import com.github.yulichang.test.kt.entity.UserDto
+import com.github.yulichang.test.kt.mapper.AreaMapper
+import com.github.yulichang.test.util.Reset
+import com.github.yulichang.toolkit.KtWrappers
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+
+@SpringBootTest
+class FieldNameTest {
+    @Autowired
+    private val areaMapper: AreaMapper? = null
+
+    @BeforeEach
+    fun setUp() {
+        Reset.reset()
+    }
+
+    @Test
+    fun testFieldName() {
+        val list = areaMapper?.selectJoinList(AreaDO::class.java, KtWrappers.query(AreaDO::class.java)
+                .select(AreaDO::Postcode)
+                .leftJoin(UserDto::class.java, UserDto::id, AreaDO::id))
+        list?.forEach(System.out::println)
+        assert(list?.get(0)?.Postcode != null)
+    }
+
+    @Test
+    fun testFieldName1() {
+        val list = areaMapper?.selectJoinList(AreaDTO::class.java, KtWrappers.query(AreaDO::class.java)
+                .selectAs(AreaDO::Postcode, AreaDTO::postcode)
+                .leftJoin(UserDto::class.java, UserDto::id, AreaDO::id))
+        list?.forEach(System.out::println)
+        assert(list?.get(0)?.postcode != null)
+    }
+}
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/SelectSubTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/SelectSubTest.kt
new file mode 100644
index 0000000..a59106c
--- /dev/null
+++ b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/SelectSubTest.kt
@@ -0,0 +1,53 @@
+package com.github.yulichang.test.kt.m
+
+import com.github.yulichang.test.kt.entity.AddressDO
+import com.github.yulichang.test.kt.entity.AreaDO
+import com.github.yulichang.test.kt.entity.UserDO
+import com.github.yulichang.test.util.ThreadLocalUtils
+import com.github.yulichang.toolkit.KtWrappers
+import org.junit.jupiter.api.BeforeEach
+import org.springframework.boot.test.context.SpringBootTest
+
+@SpringBootTest
+class SelectSubTest {
+    @BeforeEach
+    fun setUp() {
+        com.github.yulichang.test.util.Reset.reset()
+    }
+
+    /**
+     * select 子查询
+     */
+    @org.junit.jupiter.api.Test
+    fun sub() {
+        ThreadLocalUtils.set("SELECT (SELECT st.id FROM `user` st WHERE st.del = false AND (st.id = t.id AND st.id = ?) LIMIT 1) AS id, (SELECT st.id FROM `user` st WHERE st.del = false AND (st.id = t.id AND st.id = ?) LIMIT 1) AS name FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del = false AND t1.del = false AND (t.id <= ?)")
+        val wrapper = KtWrappers.query(UserDO::class.java)
+                .selectSub(UserDO::class.java, { w ->
+                    w.select(UserDO::id)
+                            .eq(UserDO::id, UserDO::id)
+                            .eq(UserDO::id, 2)
+                            .last("limit 1")
+                }, UserDO::id)
+                .selectSub(UserDO::class.java, { w ->
+                    w.select(UserDO::id)
+                            .eq(UserDO::id, UserDO::id)
+                            .eq(UserDO::id, 3)
+                            .last("limit 1")
+                }, UserDO::name)
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .le(UserDO::id, 100)
+        wrapper.list()
+
+
+        ThreadLocalUtils.set("SELECT (SELECT st.id FROM area st WHERE st.del = false AND (st.id = t1.id) LIMIT 1) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del = false AND t1.del = false AND (t.id <= ?)")
+        val wrapper1 = KtWrappers.query(UserDO::class.java)
+                .selectSub(AreaDO::class.java, { w ->
+                    w.select(AreaDO::id)
+                            .eq(AreaDO::id, AddressDO::id)
+                            .last("limit 1")
+                }, UserDO::id)
+                .leftJoin(AddressDO::class.java, AddressDO::userId, UserDO::id)
+                .le(UserDO::id, 100)
+        wrapper1.list()
+    }
+}
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/UnionTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/UnionTest.kt
new file mode 100644
index 0000000..3e179c7
--- /dev/null
+++ b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/UnionTest.kt
@@ -0,0 +1,83 @@
+package com.github.yulichang.test.kt.m
+
+import com.github.yulichang.test.kt.entity.AddressDO
+import com.github.yulichang.test.kt.entity.AreaDO
+import com.github.yulichang.test.kt.entity.UserDO
+import com.github.yulichang.test.util.Reset
+import com.github.yulichang.test.util.ThreadLocalUtils
+import com.github.yulichang.toolkit.KtWrappers
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.springframework.boot.test.context.SpringBootTest
+
+@Suppress("DEPRECATION")
+@SpringBootTest
+class UnionTest {
+    @BeforeEach
+    fun setUp() {
+        Reset.reset()
+    }
+
+    @Test
+    fun union() {
+        ThreadLocalUtils.set("SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t WHERE t.del=false AND (t.id = ?) UNION SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t WHERE (t.`name` = ? AND (t.`name` = ?)) UNION SELECT t.id,t.pid,t.`name`,t.`json`,t.sex,t.head_img,t.create_time,t.address_id,t.address_id2,t.del,t.create_by,t.update_by FROM `user` t WHERE t.del=false AND (t.pid = ?)")
+        val wrapper = KtWrappers.query(UserDO::class.java)
+                .selectAll(UserDO::class.java)
+                .eq(UserDO::id, 1)
+        val wrapper1 = KtWrappers.query(UserDO::class.java)
+                .selectAll(UserDO::class.java)
+                .disableLogicDel()
+                .eq(UserDO::name, "张三 2")
+                .and { w -> w.eq(UserDO::name, "张三 2") }
+        val wrapper2 = KtWrappers.query(UserDO::class.java)
+                .selectAll(UserDO::class.java)
+                .eq(UserDO::pid, 2)
+        wrapper.union(wrapper1, wrapper2)
+        val list: List<UserDO> = wrapper.list()
+        println(wrapper.unionSql)
+        assert(list.size == 7 && list[0].id != null)
+    }
+
+
+    @Test
+    fun unionAll() {
+        ThreadLocalUtils.set("SELECT t.id FROM `user` t WHERE t.del = false AND (t.id = ?) UNION ALL SELECT t.id FROM address t UNION ALL SELECT t.id FROM area t WHERE t.del = false AND (t.id = ?)")
+        val wrapper = KtWrappers.query(UserDO::class.java)
+                .select(UserDO::id)
+                .eq(UserDO::id, 1)
+        val wrapper1 = KtWrappers.query(AddressDO::class.java)
+                .select(AddressDO::id)
+                .disableLogicDel()
+        val wrapper2 = KtWrappers.query(AreaDO::class.java)
+                .select(AreaDO::id)
+                .eq(AreaDO::id, 2)
+        wrapper.unionAll(wrapper1, wrapper2)
+        val list: List<UserDO> = wrapper.list()
+        assert(list.size == 23 && list[0].id != null)
+    }
+
+    @Test
+    fun unionAll1() {
+        ThreadLocalUtils.set("SELECT t.id FROM `user` t WHERE t.del = false AND (t.id = ?) UNION ALL SELECT t.id FROM address t WHERE (t.id = ?) UNION ALL SELECT (SELECT st.id FROM area st WHERE st.del = false AND (st.id = ? AND (st.id = ?))) AS id FROM area t WHERE t.del = false AND (t.id = ? AND (t.id = ?))")
+        val wrapper = KtWrappers.query(UserDO::class.java)
+                .select(UserDO::id)
+                .eq(UserDO::id, 1)
+                .unionAll(AddressDO::class.java) { union ->
+                    union.select(AddressDO::id)
+                            .disableLogicDel()
+                            .eq(UserDO::id, 2)
+                }
+                .unionAll(AreaDO::class.java) { union ->
+                    union.selectSub(AreaDO::class.java, { sub ->
+                        sub.select(AreaDO::id)
+                                .eq(AreaDO::id, 3)
+                                .and { and -> and.eq(AreaDO::id, 4) }
+                    }, AreaDO::id)
+                            .eq(AreaDO::id, 5)
+                            .and { and -> and.eq(AreaDO::id, 6) }
+                }
+        println(wrapper.unionSql)
+        val list: List<UserDO> = wrapper.list()
+        assert(list.size == 2 && list[0].id != null)
+    }
+}

From 8170305daf885fedc1b3e979dae33b4d3508ae10 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Thu, 7 Dec 2023 02:08:20 +0800
Subject: [PATCH 30/88] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/MPJInterceptorConfig.java          |   2 +-
 .../github/yulichang/kt/KtLambdaWrapper.java  |   4 +-
 .../yulichang/toolkit/FieldStringMap.java     |   2 +-
 .../wrapper/MPJAbstractLambdaWrapper.java     |  14 +-
 .../yulichang/wrapper/MPJAbstractWrapper.java | 202 +++++----
 .../yulichang/wrapper/MPJLambdaWrapper.java   |   4 +-
 .../yulichang/wrapper/interfaces/Compare.java | 203 ++++++----
 .../yulichang/wrapper/interfaces/Func.java    | 383 +++++++++++-------
 .../wrapper/interfaces/OnCompare.java         | 186 +++++++--
 .../wrapper/interfaces/QueryJoin.java         |  88 +++-
 .../yulichang/test/join/m/TableAliasTest.java |  87 ++++
 11 files changed, 810 insertions(+), 365 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/TableAliasTest.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
index b2853dc..22a510a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
@@ -30,7 +30,7 @@ public class MPJInterceptorConfig {
             System.out.println(" _ _   |_  _ _|_. ___ _ |    _  .  _  .  _  \n" +
                     "| | |\\/|_)(_| | |_\\  |_)||_|_\\  | (_) | | | \n" +
                     "     /               |          /\n" +
-                    "                                    1.4.7.2");
+                    "                                    1.4.8");
         }
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
index 26e8a25..51f4eb6 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
@@ -253,7 +253,7 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
      * 例： wrapper.union(UserDO.class, union -> union.selectAll(UserDO.class))
      *
      * @param clazz union语句的主表类型
-     * @since 1.4.7.3
+     * @since 1.4.8
      */
     public <U> KtLambdaWrapper<T> union(Class<U> clazz, Consumer<KtLambdaWrapper<U>> consumer) {
         KtLambdaWrapper<U> unionWrapper = KtWrappers.query(clazz);
@@ -301,7 +301,7 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
      * 例： wrapper.unionAll(UserDO.class, union -> union.selectAll(UserDO.class))
      *
      * @param clazz union语句的主表类型
-     * @since 1.4.7.3
+     * @since 1.4.8
      */
     public <U> KtLambdaWrapper<T> unionAll(Class<U> clazz, Consumer<KtLambdaWrapper<U>> consumer) {
         KtLambdaWrapper<U> unionWrapper = KtWrappers.query(clazz);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java
index 51d6f5a..2d1196a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java
@@ -6,7 +6,7 @@ import java.util.Locale;
 /**
  * @author yulichang
  * @see HashMap
- * @since 1.4.7.3
+ * @since 1.4.8
  */
 public class FieldStringMap<V> extends HashMap<String, V> {
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
index 47b7bf8..c0fc4fc 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
@@ -219,19 +219,19 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
     }
 
     @Override
-    protected <X> String columnToString(Integer index, X column, boolean isJoin, PrefixEnum prefixEnum) {
-        return columnToString(index, (SFunction<?, ?>) column, isJoin, prefixEnum);
+    protected <X> String columnToString(Integer index, String alias, X column, boolean isJoin, PrefixEnum prefixEnum) {
+        return columnToString(index, alias, (SFunction<?, ?>) column, isJoin, prefixEnum);
     }
 
     @Override
     @SafeVarargs
-    protected final <X> String columnsToString(Integer index, boolean isJoin, PrefixEnum prefixEnum, X... columns) {
-        return Arrays.stream(columns).map(i -> columnToString(index, (SFunction<?, ?>) i, isJoin, prefixEnum)).collect(joining(StringPool.COMMA));
+    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)).collect(joining(StringPool.COMMA));
     }
 
-    protected String columnToString(Integer index, SFunction<?, ?> column, boolean isJoin, PrefixEnum prefixEnum) {
+    protected String columnToString(Integer index, String alias, SFunction<?, ?> column, boolean isJoin, PrefixEnum prefixEnum) {
         Class<?> entityClass = LambdaUtils.getEntityClass(column);
-        return getDefault(index, entityClass, isJoin, prefixEnum) + StringPool.DOT + getCache(column).getColumn();
+        return (alias == null ? getDefault(index, entityClass, isJoin, prefixEnum) : alias) + StringPool.DOT + getCache(column).getColumn();
     }
 
     protected SelectCache getCache(SFunction<?, ?> fn) {
@@ -378,7 +378,7 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
         TableInfo info = TableHelper.get(clazz);
         Asserts.hasTable(info, clazz);
         Children instance = instance(newIndex, keyWord, clazz, info.getTableName());
-        instance.isNo = true;
+        instance.isOn = true;
         instance.isMain = false;
         onWrappers.add(instance);
         if (StringUtils.isBlank(tableAlias)) {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
index 442978d..dbd1832 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
@@ -37,7 +37,7 @@ import static java.util.stream.Collectors.joining;
  *
  * @author yulichang
  */
-@SuppressWarnings("ALL")
+@SuppressWarnings({"unchecked", "unused", "DuplicatedCode"})
 public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<T, Children>> extends Wrapper<T>
         implements Compare<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
         CompareStr<Children, String>, FuncStr<Children, String> {
@@ -56,6 +56,7 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      */
     @Getter
     protected AtomicInteger paramNameSeq;
+    @Getter
     protected Map<String, Object> paramNameValuePairs;
     /**
      * 其他
@@ -102,7 +103,7 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     /**
      * 是否是OnWrapper
      */
-    protected boolean isNo = false;
+    protected boolean isOn = false;
 
     /**
      * 关联的表
@@ -201,64 +202,64 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     }
 
     @Override
-    public <X> Children eq(boolean condition, SFunction<X, ?> column, Object val) {
-        return addCondition(condition, column, EQ, val);
+    public <X> Children eq(boolean condition, String alias, SFunction<X, ?> column, Object val) {
+        return addCondition(condition, alias, column, EQ, val);
     }
 
     @Override
-    public <X> Children ne(boolean condition, SFunction<X, ?> column, Object val) {
-        return addCondition(condition, column, NE, val);
+    public <X> Children ne(boolean condition, String alias, SFunction<X, ?> column, Object val) {
+        return addCondition(condition, alias, column, NE, val);
     }
 
     @Override
-    public <X> Children gt(boolean condition, SFunction<X, ?> column, Object val) {
-        return addCondition(condition, column, GT, val);
+    public <X> Children gt(boolean condition, String alias, SFunction<X, ?> column, Object val) {
+        return addCondition(condition, alias, column, GT, val);
     }
 
     @Override
-    public <X> Children ge(boolean condition, SFunction<X, ?> column, Object val) {
-        return addCondition(condition, column, GE, val);
+    public <X> Children ge(boolean condition, String alias, SFunction<X, ?> column, Object val) {
+        return addCondition(condition, alias, column, GE, val);
     }
 
     @Override
-    public <X> Children lt(boolean condition, SFunction<X, ?> column, Object val) {
-        return addCondition(condition, column, LT, val);
+    public <X> Children lt(boolean condition, String alias, SFunction<X, ?> column, Object val) {
+        return addCondition(condition, alias, column, LT, val);
     }
 
     @Override
-    public <X> Children le(boolean condition, SFunction<X, ?> column, Object val) {
-        return addCondition(condition, column, LE, val);
+    public <X> Children le(boolean condition, String alias, SFunction<X, ?> column, Object val) {
+        return addCondition(condition, alias, column, LE, val);
     }
 
     @Override
-    public <X> Children like(boolean condition, SFunction<X, ?> column, Object val) {
-        return likeValue(condition, LIKE, column, val, SqlLike.DEFAULT);
+    public <X> Children like(boolean condition, String alias, SFunction<X, ?> column, Object val) {
+        return likeValue(condition, LIKE, alias, column, val, SqlLike.DEFAULT);
     }
 
     @Override
-    public <X> Children notLike(boolean condition, SFunction<X, ?> column, Object val) {
-        return likeValue(condition, NOT_LIKE, column, val, SqlLike.DEFAULT);
+    public <X> Children notLike(boolean condition, String alias, SFunction<X, ?> column, Object val) {
+        return likeValue(condition, NOT_LIKE, alias, column, val, SqlLike.DEFAULT);
     }
 
     @Override
-    public <X> Children likeLeft(boolean condition, SFunction<X, ?> column, Object val) {
-        return likeValue(condition, LIKE, column, val, SqlLike.LEFT);
+    public <X> Children likeLeft(boolean condition, String alias, SFunction<X, ?> column, Object val) {
+        return likeValue(condition, LIKE, alias, column, val, SqlLike.LEFT);
     }
 
     @Override
-    public <X> Children likeRight(boolean condition, SFunction<X, ?> column, Object val) {
-        return likeValue(condition, LIKE, column, val, SqlLike.RIGHT);
+    public <X> Children likeRight(boolean condition, String alias, SFunction<X, ?> column, Object val) {
+        return likeValue(condition, LIKE, alias, column, val, SqlLike.RIGHT);
     }
 
     @Override
-    public <X> Children between(boolean condition, SFunction<X, ?> column, Object val1, Object val2) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), BETWEEN,
+    public <X> Children between(boolean condition, String alias, SFunction<X, ?> column, Object val1, Object val2) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), BETWEEN,
                 () -> formatParam(null, val1), AND, () -> formatParam(null, val2)));
     }
 
     @Override
-    public <X> Children notBetween(boolean condition, SFunction<X, ?> column, Object val1, Object val2) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), NOT_BETWEEN,
+    public <X> Children notBetween(boolean condition, String alias, SFunction<X, ?> column, Object val1, Object val2) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), NOT_BETWEEN,
                 () -> formatParam(null, val1), AND, () -> formatParam(null, val2)));
     }
 
@@ -329,89 +330,89 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     }
 
     @Override
-    public <X> Children isNull(boolean condition, SFunction<X, ?> column) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), IS_NULL));
+    public <X> Children isNull(boolean condition, String alias, SFunction<X, ?> column) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), IS_NULL));
     }
 
     @Override
-    public <X> Children isNotNull(boolean condition, SFunction<X, ?> column) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), IS_NOT_NULL));
+    public <X> Children isNotNull(boolean condition, String alias, SFunction<X, ?> column) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), IS_NOT_NULL));
     }
 
     @Override
-    public <X> Children in(boolean condition, SFunction<X, ?> column, Collection<?> coll) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), IN, inExpression(coll)));
+    public <X> Children in(boolean condition, String alias, SFunction<X, ?> column, Collection<?> coll) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), IN, inExpression(coll)));
     }
 
     @Override
-    public <X> Children in(boolean condition, SFunction<X, ?> column, Object... values) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), IN, inExpression(values)));
+    public <X> Children in(boolean condition, String alias, SFunction<X, ?> column, Object... values) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), IN, inExpression(values)));
     }
 
     @Override
-    public <X> Children notIn(boolean condition, SFunction<X, ?> column, Collection<?> coll) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), NOT_IN, inExpression(coll)));
+    public <X> Children notIn(boolean condition, String alias, SFunction<X, ?> column, Collection<?> coll) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), NOT_IN, inExpression(coll)));
     }
 
     @Override
-    public <X> Children notIn(boolean condition, SFunction<X, ?> column, Object... values) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), NOT_IN, inExpression(values)));
+    public <X> Children notIn(boolean condition, String alias, SFunction<X, ?> column, Object... values) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), NOT_IN, inExpression(values)));
     }
 
     @Override
-    public <X> Children inSql(boolean condition, SFunction<X, ?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), IN,
+    public <X> Children inSql(boolean condition, String alias, SFunction<X, ?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), IN,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
-    public <X> Children notInSql(boolean condition, SFunction<X, ?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), NOT_IN,
+    public <X> Children notInSql(boolean condition, String alias, SFunction<X, ?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), NOT_IN,
                 () -> String.format("(%s)", inValue)));
     }
 
 
     @Override
-    public <X> Children gtSql(boolean condition, SFunction<X, ?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), GT,
+    public <X> Children gtSql(boolean condition, String alias, SFunction<X, ?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), GT,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
-    public <X> Children geSql(boolean condition, SFunction<X, ?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), GE,
+    public <X> Children geSql(boolean condition, String alias, SFunction<X, ?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), GE,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
-    public <X> Children ltSql(boolean condition, SFunction<X, ?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), LT,
+    public <X> Children ltSql(boolean condition, String alias, SFunction<X, ?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), LT,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
-    public <X> Children leSql(boolean condition, SFunction<X, ?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), LE,
+    public <X> Children leSql(boolean condition, String alias, SFunction<X, ?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), LE,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
-    public <R> Children groupBy(boolean condition, List<SFunction<R, ?>> columns) {
+    public <R> Children groupBy(boolean condition, String alias, List<SFunction<R, ?>> columns) {
         return maybeDo(condition, () -> {
             if (CollectionUtils.isNotEmpty(columns)) {
-                String one = (StringPool.COMMA + columnsToString(index, false, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, columns));
-                final String finalOne = one;
+                final String finalOne = (StringPool.COMMA + columnsToString(index, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, alias, columns));
                 appendSqlSegments(GROUP_BY, () -> finalOne);
             }
         });
     }
 
+    @SafeVarargs
     @Override
-    public <X> Children groupBy(boolean condition, SFunction<X, ?> column, SFunction<X, ?>... columns) {
+    public final <X> Children groupBy(boolean condition, String alias, SFunction<X, ?> column, SFunction<X, ?>... columns) {
         return maybeDo(condition, () -> {
-            String one = columnToString(index, column, false, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST);
+            String one = columnToString(index, alias, column, false, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST);
             if (ArrayUtils.isNotEmpty(columns)) {
-                one += (StringPool.COMMA + columnsToString(index, false, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, columns));
+                one += (StringPool.COMMA + columnsToString(index, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, alias, columns));
             }
             final String finalOne = one;
             appendSqlSegments(GROUP_BY, () -> finalOne);
@@ -419,35 +420,33 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     }
 
     @Override
-    public <R> Children orderByAsc(boolean condition, List<SFunction<R, ?>> columns) {
+    public <R> Children orderByAsc(boolean condition, String alias, List<SFunction<R, ?>> columns) {
         return maybeDo(condition, () -> {
-            final SqlKeyword mode = ASC;
             if (CollectionUtils.isNotEmpty(columns)) {
                 columns.forEach(c -> appendSqlSegments(ORDER_BY,
-                        columnToSqlSegment(index, columnSqlInjectFilter(c), false), mode));
+                        columnToSqlSegment(index, alias, columnSqlInjectFilter(c)), ASC));
             }
         });
     }
 
     @Override
-    public <R> Children orderByDesc(boolean condition, List<SFunction<R, ?>> columns) {
+    public <R> Children orderByDesc(boolean condition, String alias, List<SFunction<R, ?>> columns) {
         return maybeDo(condition, () -> {
-            final SqlKeyword mode = DESC;
             if (CollectionUtils.isNotEmpty(columns)) {
                 columns.forEach(c -> appendSqlSegments(ORDER_BY,
-                        columnToSqlSegment(index, columnSqlInjectFilter(c), false), mode));
+                        columnToSqlSegment(index, alias, columnSqlInjectFilter(c)), DESC));
             }
         });
     }
 
     @Override
-    public <X> Children orderBy(boolean condition, boolean isAsc, SFunction<X, ?> column, SFunction<X, ?>... columns) {
+    public <X> Children orderBy(boolean condition, boolean isAsc, String alias, SFunction<X, ?> column, SFunction<X, ?>... columns) {
         return maybeDo(condition, () -> {
             final SqlKeyword mode = isAsc ? ASC : DESC;
-            appendSqlSegments(ORDER_BY, columnToSqlSegment(index, column, false), mode);
+            appendSqlSegments(ORDER_BY, columnToSqlSegment(index, alias, column), mode);
             if (ArrayUtils.isNotEmpty(columns)) {
                 Arrays.stream(columns).forEach(c -> appendSqlSegments(ORDER_BY,
-                        columnToSqlSegment(index, columnSqlInjectFilter(c), false), mode));
+                        columnToSqlSegment(index, alias, columnSqlInjectFilter(c)), mode));
             }
         });
     }
@@ -456,7 +455,6 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      * 字段 SQL 注入过滤处理，子类重写实现过滤逻辑
      *
      * @param column 字段内容
-     * @return
      */
     protected <X> SFunction<X, ?> columnSqlInjectFilter(SFunction<X, ?> column) {
         return column;
@@ -493,8 +491,8 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      * 内部自用
      * <p>拼接 LIKE 以及 值</p>
      */
-    protected <X> Children likeValue(boolean condition, SqlKeyword keyword, SFunction<X, ?> column, Object val, SqlLike sqlLike) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), keyword,
+    protected <X> Children likeValue(boolean condition, SqlKeyword keyword, String alias, SFunction<X, ?> column, Object val, SqlLike sqlLike) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), keyword,
                 () -> formatParam(null, SqlUtils.concatLike(val, sqlLike))));
     }
 
@@ -511,18 +509,18 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      * @param sqlKeyword SQL 关键词
      * @param val        条件值
      */
-    protected <X> Children addCondition(boolean condition, SFunction<X, ?> column, SqlKeyword sqlKeyword, Object val) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), sqlKeyword,
+    protected <X> Children addCondition(boolean condition, String alias, SFunction<X, ?> column, SqlKeyword sqlKeyword, Object val) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), sqlKeyword,
                 () -> formatParam(null, val)));
     }
 
-    protected <X, S> Children addCondition(boolean condition, SFunction<X, ?> column, SqlKeyword sqlKeyword, SFunction<S, ?> val) {
+    protected <X, S> Children addCondition(boolean condition, String alias, SFunction<X, ?> column,
+                                           SqlKeyword sqlKeyword, String rightAlias, SFunction<S, ?> val) {
         Class<X> c = LambdaUtils.getEntityClass(column);
         Class<S> v = LambdaUtils.getEntityClass(val);
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), sqlKeyword,
-                isNo ?
-                        columnToSqlSegmentS(index, val, v == c && v == joinClass) :
-                        columnToSqlSegmentS(index, val, v == c)
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), sqlKeyword,
+                isOn ? columnToSqlSegmentS(index, rightAlias, val, v == c && v == joinClass) :
+                        columnToSqlSegmentS(index, rightAlias, val, v == c)
         ));
     }
 
@@ -563,6 +561,7 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      * @param params  参数
      * @return sql片段
      */
+    @SuppressWarnings("SameParameterValue")
     protected final String formatSqlMaybeWithParam(String sqlStr, String mapping, Object... params) {
         if (StringUtils.isBlank(sqlStr)) {
             // todo 何时会这样?
@@ -646,7 +645,7 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
         onWrappers.clear();
         index = null;
         isMain = true;
-        isNo = false;
+        isOn = false;
     }
 
     /**
@@ -684,10 +683,6 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
         return expression;
     }
 
-    public Map<String, Object> getParamNameValuePairs() {
-        return paramNameValuePairs;
-    }
-
     public String getParamAlias() {
         return paramAlias.getStringValue() == null ? Constants.WRAPPER : paramAlias.getStringValue();
     }
@@ -698,6 +693,7 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      * @param paramAlias 参数别名
      * @return Children
      */
+    @SuppressWarnings("UnusedReturnValue")
     public Children setParamAlias(String paramAlias) {
         Assert.notEmpty(paramAlias, "paramAlias can not be empty!");
         this.paramAlias.setStringValue(paramAlias);
@@ -707,28 +703,28 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     /**
      * 获取 columnName
      */
-    protected final <X> ISqlSegment columnToSqlSegment(Integer index, SFunction<X, ?> column, boolean isJoin) {
-        return () -> columnToString(index, column, isJoin, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST);
+    protected final <X> ISqlSegment columnToSqlSegment(Integer index, String alias, SFunction<X, ?> column) {
+        return () -> columnToString(index, alias, column, false, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST);
     }
 
-    protected final <X> ISqlSegment columnToSqlSegmentS(Integer index, SFunction<X, ?> column, boolean isJoin) {
+    protected final <X> ISqlSegment columnToSqlSegmentS(Integer index, String alias, SFunction<X, ?> column, boolean isJoin) {
         PrefixEnum prefixEnum;
         if (isMain) {
-            prefixEnum = isNo ? PrefixEnum.ON_SECOND /* 理论上不可能有这种情况 */ : PrefixEnum.CD_SECOND;
+            prefixEnum = isOn ? PrefixEnum.ON_SECOND /* 理论上不可能有这种情况 */ : PrefixEnum.CD_SECOND;
         } else {
-            prefixEnum = isNo ? PrefixEnum.ON_SECOND : PrefixEnum.CD_ON_SECOND;
+            prefixEnum = isOn ? PrefixEnum.ON_SECOND : PrefixEnum.CD_ON_SECOND;
         }
-        return () -> columnToString(index, column, isJoin, prefixEnum);
+        return () -> columnToString(index, alias, column, isJoin, prefixEnum);
     }
 
-    protected final <X> ISqlSegment columnToSqlSegment(String column) {
+    protected final ISqlSegment columnToSqlSegment(String column) {
         return () -> columnsToString(column);
     }
 
     /**
      * 获取 columnName
      */
-    protected <X> String columnToString(Integer index, X column, boolean isJoin, PrefixEnum prefixEnum) {
+    protected <X> String columnToString(Integer index, String alias, X column, boolean isJoin, PrefixEnum prefixEnum) {
         return (String) column;
     }
 
@@ -753,12 +749,10 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      *
      * @param columns 多字段
      */
-    protected <X> String columnsToString(Integer index, boolean isJoin, PrefixEnum prefixEnum, X... columns) {
-        return Arrays.stream(columns).map(i -> this.columnToString(index, i, isJoin, prefixEnum)).collect(joining(StringPool.COMMA));
-    }
+    abstract <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, X... columns);
 
     @Override
-    @SuppressWarnings("all")
+    @SuppressWarnings("MethodDoesntCallSuperMethod")
     public Children clone() {
         return SerializationUtils.clone(typedThis);
     }
@@ -775,33 +769,33 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     /* ************************* on语句重载 *************************** */
 
     @Override
-    public <R, S> Children eq(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
-        return addCondition(condition, column, EQ, val);
+    public <R, S> Children eq(boolean condition, String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return addCondition(condition, alias, column, EQ, rightAlias, val);
     }
 
     @Override
-    public <R, S> Children ne(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
-        return addCondition(condition, column, NE, val);
+    public <R, S> Children ne(boolean condition, String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return addCondition(condition, alias, column, NE, rightAlias, val);
     }
 
     @Override
-    public <R, S> Children gt(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
-        return addCondition(condition, column, GT, val);
+    public <R, S> Children gt(boolean condition, String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return addCondition(condition, alias, column, GT, rightAlias, val);
     }
 
     @Override
-    public <R, S> Children ge(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
-        return addCondition(condition, column, GE, val);
+    public <R, S> Children ge(boolean condition, String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return addCondition(condition, alias, column, GE, rightAlias, val);
     }
 
     @Override
-    public <R, S> Children lt(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
-        return addCondition(condition, column, LT, val);
+    public <R, S> Children lt(boolean condition, String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return addCondition(condition, alias, column, LT, rightAlias, val);
     }
 
     @Override
-    public <R, S> Children le(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
-        return addCondition(condition, column, LE, val);
+    public <R, S> Children le(boolean condition, String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return addCondition(condition, alias, column, LE, rightAlias, val);
     }
 
     /* ****************************************** **/
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index 3898ee5..534882c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -252,7 +252,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
      * 例： wrapper.union(UserDO.class, union -> union.selectAll(UserDO.class))
      *
      * @param clazz union语句的主表类型
-     * @since 1.4.7.3
+     * @since 1.4.8
      */
     public <U> MPJLambdaWrapper<T> union(Class<U> clazz, Consumer<MPJLambdaWrapper<U>> consumer) {
         MPJLambdaWrapper<U> unionWrapper = JoinWrappers.lambda(clazz);
@@ -300,7 +300,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
      * 例： wrapper.unionAll(UserDO.class, union -> union.selectAll(UserDO.class))
      *
      * @param clazz union语句的主表类型
-     * @since 1.4.7.3
+     * @since 1.4.8
      */
     public <U> MPJLambdaWrapper<T> unionAll(Class<U> clazz, Consumer<MPJLambdaWrapper<U>> consumer) {
         MPJLambdaWrapper<U> unionWrapper = JoinWrappers.lambda(clazz);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Compare.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Compare.java
index 1d3b191..7b76b5a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Compare.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Compare.java
@@ -14,16 +14,12 @@ import java.util.function.BiPredicate;
 @SuppressWarnings("unused")
 public interface Compare<Children> extends Serializable {
 
-    /**
-     * ignore
-     */
+
     default <R, V> Children allEq(Map<SFunction<R, ?>, V> params) {
         return allEq(params, true);
     }
 
-    /**
-     * ignore
-     */
+
     default <R, V> Children allEq(Map<SFunction<R, ?>, V> params, boolean null2IsNull) {
         return allEq(true, params, null2IsNull);
     }
@@ -38,16 +34,12 @@ public interface Compare<Children> extends Serializable {
      */
     <R, V> Children allEq(boolean condition, Map<SFunction<R, ?>, V> params, boolean null2IsNull);
 
-    /**
-     * ignore
-     */
+
     default <R, V> Children allEq(BiPredicate<SFunction<R, ?>, V> filter, Map<SFunction<R, ?>, V> params) {
         return allEq(filter, params, true);
     }
 
-    /**
-     * ignore
-     */
+
     default <R, V> Children allEq(BiPredicate<SFunction<R, ?>, V> filter, Map<SFunction<R, ?>, V> params, boolean null2IsNull) {
         return allEq(true, filter, params, null2IsNull);
     }
@@ -63,12 +55,16 @@ public interface Compare<Children> extends Serializable {
      */
     <R, V> Children allEq(boolean condition, BiPredicate<SFunction<R, ?>, V> filter, Map<SFunction<R, ?>, V> params, boolean null2IsNull);
 
-    /**
-     * ignore
-     */
-    @SuppressWarnings("UnusedReturnValue")
     default <R> Children eq(SFunction<R, ?> column, Object val) {
-        return eq(true, column, val);
+        return eq(true, null, column, val);
+    }
+
+    default <R> Children eq(String alias, SFunction<R, ?> column, Object val) {
+        return eq(true, alias, column, val);
+    }
+
+    default <R> Children eq(boolean condition, SFunction<R, ?> column, Object val) {
+        return eq(condition, null, column, val);
     }
 
     /**
@@ -79,30 +75,42 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R> Children eq(boolean condition, SFunction<R, ?> column, Object val);
+    <R> Children eq(boolean condition, String alias, SFunction<R, ?> column, Object val);
 
-    /**
-     * ignore
-     */
     default <R> Children ne(SFunction<R, ?> column, Object val) {
-        return ne(true, column, val);
+        return ne(true, null, column, val);
+    }
+
+    default <R> Children ne(String alias, SFunction<R, ?> column, Object val) {
+        return ne(true, alias, column, val);
+    }
+
+    default <R> Children ne(boolean condition, SFunction<R, ?> column, Object val) {
+        return ne(condition, null, column, val);
     }
 
     /**
      * 不等于 &lt;&gt;
      *
      * @param condition 执行条件
+     * @param alias     字段别名
      * @param column    字段
      * @param val       值
      * @return children
      */
-    <R> Children ne(boolean condition, SFunction<R, ?> column, Object val);
+    <R> Children ne(boolean condition, String alias, SFunction<R, ?> column, Object val);
+
 
-    /**
-     * ignore
-     */
     default <R> Children gt(SFunction<R, ?> column, Object val) {
-        return gt(true, column, val);
+        return gt(true, null, column, val);
+    }
+
+    default <R> Children gt(String alias, SFunction<R, ?> column, Object val) {
+        return gt(true, alias, column, val);
+    }
+
+    default <R> Children gt(boolean condition, SFunction<R, ?> column, Object val) {
+        return gt(condition, null, column, val);
     }
 
     /**
@@ -113,13 +121,18 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R> Children gt(boolean condition, SFunction<R, ?> column, Object val);
+    <R> Children gt(boolean condition, String alias, SFunction<R, ?> column, Object val);
 
-    /**
-     * ignore
-     */
     default <R> Children ge(SFunction<R, ?> column, Object val) {
-        return ge(true, column, val);
+        return ge(true, null, column, val);
+    }
+
+    default <R> Children ge(String alias, SFunction<R, ?> column, Object val) {
+        return ge(true, alias, column, val);
+    }
+
+    default <R> Children ge(boolean condition, SFunction<R, ?> column, Object val) {
+        return ge(condition, null, column, val);
     }
 
     /**
@@ -130,13 +143,19 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R> Children ge(boolean condition, SFunction<R, ?> column, Object val);
+    <R> Children ge(boolean condition, String alias, SFunction<R, ?> column, Object val);
+
 
-    /**
-     * ignore
-     */
     default <R> Children lt(SFunction<R, ?> column, Object val) {
-        return lt(true, column, val);
+        return lt(true, null, column, val);
+    }
+
+    default <R> Children lt(String alias, SFunction<R, ?> column, Object val) {
+        return lt(true, alias, column, val);
+    }
+
+    default <R> Children lt(boolean condition, SFunction<R, ?> column, Object val) {
+        return lt(condition, null, column, val);
     }
 
     /**
@@ -147,13 +166,19 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R> Children lt(boolean condition, SFunction<R, ?> column, Object val);
+    <R> Children lt(boolean condition, String alias, SFunction<R, ?> column, Object val);
+
 
-    /**
-     * ignore
-     */
     default <R> Children le(SFunction<R, ?> column, Object val) {
-        return le(true, column, val);
+        return le(true, null, column, val);
+    }
+
+    default <R> Children le(String alias, SFunction<R, ?> column, Object val) {
+        return le(true, alias, column, val);
+    }
+
+    default <R> Children le(boolean condition, SFunction<R, ?> column, Object val) {
+        return le(condition, null, column, val);
     }
 
     /**
@@ -164,13 +189,19 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R> Children le(boolean condition, SFunction<R, ?> column, Object val);
+    <R> Children le(boolean condition, String alias, SFunction<R, ?> column, Object val);
+
 
-    /**
-     * ignore
-     */
     default <R> Children between(SFunction<R, ?> column, Object val1, Object val2) {
-        return between(true, column, val1, val2);
+        return between(true, null, column, val1, val2);
+    }
+
+    default <R> Children between(String alias, SFunction<R, ?> column, Object val1, Object val2) {
+        return between(true, alias, column, val1, val2);
+    }
+
+    default <R> Children between(boolean condition, SFunction<R, ?> column, Object val1, Object val2) {
+        return between(condition, null, column, val1, val2);
     }
 
     /**
@@ -182,13 +213,19 @@ public interface Compare<Children> extends Serializable {
      * @param val2      值2
      * @return children
      */
-    <R> Children between(boolean condition, SFunction<R, ?> column, Object val1, Object val2);
+    <R> Children between(boolean condition, String alias, SFunction<R, ?> column, Object val1, Object val2);
+
 
-    /**
-     * ignore
-     */
     default <R> Children notBetween(SFunction<R, ?> column, Object val1, Object val2) {
-        return notBetween(true, column, val1, val2);
+        return notBetween(true, null, column, val1, val2);
+    }
+
+    default <R> Children notBetween(String alias, SFunction<R, ?> column, Object val1, Object val2) {
+        return notBetween(true, alias, column, val1, val2);
+    }
+
+    default <R> Children notBetween(boolean condition, SFunction<R, ?> column, Object val1, Object val2) {
+        return notBetween(condition, null, column, val1, val2);
     }
 
     /**
@@ -200,13 +237,18 @@ public interface Compare<Children> extends Serializable {
      * @param val2      值2
      * @return children
      */
-    <R> Children notBetween(boolean condition, SFunction<R, ?> column, Object val1, Object val2);
+    <R> Children notBetween(boolean condition, String alias, SFunction<R, ?> column, Object val1, Object val2);
 
-    /**
-     * ignore
-     */
     default <R> Children like(SFunction<R, ?> column, Object val) {
-        return like(true, column, val);
+        return like(true, null, column, val);
+    }
+
+    default <R> Children like(String alias, SFunction<R, ?> column, Object val) {
+        return like(true, alias, column, val);
+    }
+
+    default <R> Children like(boolean condition, SFunction<R, ?> column, Object val) {
+        return like(condition, null, column, val);
     }
 
     /**
@@ -217,13 +259,18 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R> Children like(boolean condition, SFunction<R, ?> column, Object val);
+    <R> Children like(boolean condition, String alias, SFunction<R, ?> column, Object val);
 
-    /**
-     * ignore
-     */
     default <R> Children notLike(SFunction<R, ?> column, Object val) {
-        return notLike(true, column, val);
+        return notLike(true, null, column, val);
+    }
+
+    default <R> Children notLike(String alias, SFunction<R, ?> column, Object val) {
+        return notLike(true, alias, column, val);
+    }
+
+    default <R> Children notLike(boolean condition, SFunction<R, ?> column, Object val) {
+        return notLike(condition, null, column, val);
     }
 
     /**
@@ -234,13 +281,18 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R> Children notLike(boolean condition, SFunction<R, ?> column, Object val);
+    <R> Children notLike(boolean condition, String alias, SFunction<R, ?> column, Object val);
 
-    /**
-     * ignore
-     */
     default <R> Children likeLeft(SFunction<R, ?> column, Object val) {
-        return likeLeft(true, column, val);
+        return likeLeft(true, null, column, val);
+    }
+
+    default <R> Children likeLeft(String alias, SFunction<R, ?> column, Object val) {
+        return likeLeft(true, alias, column, val);
+    }
+
+    default <R> Children likeLeft(boolean condition, SFunction<R, ?> column, Object val) {
+        return likeLeft(condition, null, column, val);
     }
 
     /**
@@ -251,13 +303,18 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R> Children likeLeft(boolean condition, SFunction<R, ?> column, Object val);
+    <R> Children likeLeft(boolean condition, String alias, SFunction<R, ?> column, Object val);
 
-    /**
-     * ignore
-     */
     default <R> Children likeRight(SFunction<R, ?> column, Object val) {
-        return likeRight(true, column, val);
+        return likeRight(true, null, column, val);
+    }
+
+    default <R> Children likeRight(String alias, SFunction<R, ?> column, Object val) {
+        return likeRight(true, alias, column, val);
+    }
+
+    default <R> Children likeRight(boolean condition, SFunction<R, ?> column, Object val) {
+        return likeRight(condition, null, column, val);
     }
 
     /**
@@ -268,5 +325,5 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R> Children likeRight(boolean condition, SFunction<R, ?> column, Object val);
+    <R> Children likeRight(boolean condition, String alias, SFunction<R, ?> column, Object val);
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java
index a167f2b..0e7b114 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java
@@ -12,15 +12,20 @@ import java.util.function.Consumer;
  * <p>
  * copy {@link com.baomidou.mybatisplus.core.conditions.interfaces.Func}
  */
-@SuppressWarnings({"unchecked", "unused", "JavadocDeclaration"})
+@SuppressWarnings({"unchecked", "unused"})
 public interface Func<Children> extends Serializable {
 
-    /**
-     * ignore
-     */
-    @SuppressWarnings("UnusedReturnValue")
+
     default <R> Children isNull(SFunction<R, ?> column) {
-        return isNull(true, column);
+        return isNull(true, null, column);
+    }
+
+    default <R> Children isNull(String alias, SFunction<R, ?> column) {
+        return isNull(true, alias, column);
+    }
+
+    default <R> Children isNull(boolean condition, SFunction<R, ?> column) {
+        return isNull(condition, null, column);
     }
 
     /**
@@ -31,13 +36,19 @@ public interface Func<Children> extends Serializable {
      * @param column    字段
      * @return children
      */
-    <R> Children isNull(boolean condition, SFunction<R, ?> column);
+    <R> Children isNull(boolean condition, String alias, SFunction<R, ?> column);
+
 
-    /**
-     * ignore
-     */
     default <R> Children isNotNull(SFunction<R, ?> column) {
-        return isNotNull(true, column);
+        return isNotNull(true, null, column);
+    }
+
+    default <R> Children isNotNull(String alias, SFunction<R, ?> column) {
+        return isNotNull(true, alias, column);
+    }
+
+    default <R> Children isNotNull(boolean condition, SFunction<R, ?> column) {
+        return isNotNull(condition, null, column);
     }
 
     /**
@@ -48,13 +59,19 @@ public interface Func<Children> extends Serializable {
      * @param column    字段
      * @return children
      */
-    <R> Children isNotNull(boolean condition, SFunction<R, ?> column);
+    <R> Children isNotNull(boolean condition, String alias, SFunction<R, ?> column);
+
 
-    /**
-     * ignore
-     */
     default <R> Children in(SFunction<R, ?> column, Collection<?> coll) {
-        return in(true, column, coll);
+        return in(true, null, column, coll);
+    }
+
+    default <R> Children in(String alias, SFunction<R, ?> column, Collection<?> coll) {
+        return in(true, alias, column, coll);
+    }
+
+    default <R> Children in(boolean condition, SFunction<R, ?> column, Collection<?> coll) {
+        return in(condition, null, column, coll);
     }
 
     /**
@@ -69,13 +86,19 @@ public interface Func<Children> extends Serializable {
      * @param coll      数据集合
      * @return children
      */
-    <R> Children in(boolean condition, SFunction<R, ?> column, Collection<?> coll);
+    <R> Children in(boolean condition, String alias, SFunction<R, ?> column, Collection<?> coll);
+
 
-    /**
-     * ignore
-     */
     default <R> Children in(SFunction<R, ?> column, Object... values) {
-        return in(true, column, values);
+        return in(true, null, column, values);
+    }
+
+    default <R> Children in(String alias, SFunction<R, ?> column, Object... values) {
+        return in(true, alias, column, values);
+    }
+
+    default <R> Children in(boolean condition, SFunction<R, ?> column, Object... values) {
+        return in(condition, null, column, values);
     }
 
     /**
@@ -90,13 +113,19 @@ public interface Func<Children> extends Serializable {
      * @param values    数据数组
      * @return children
      */
-    <R> Children in(boolean condition, SFunction<R, ?> column, Object... values);
+    <R> Children in(boolean condition, String alias, SFunction<R, ?> column, Object... values);
+
 
-    /**
-     * ignore
-     */
     default <R> Children notIn(SFunction<R, ?> column, Collection<?> coll) {
-        return notIn(true, column, coll);
+        return notIn(true, null, column, coll);
+    }
+
+    default <R> Children notIn(String alias, SFunction<R, ?> column, Collection<?> coll) {
+        return notIn(true, alias, column, coll);
+    }
+
+    default <R> Children notIn(boolean condition, SFunction<R, ?> column, Collection<?> coll) {
+        return notIn(condition, null, column, coll);
     }
 
     /**
@@ -108,13 +137,19 @@ public interface Func<Children> extends Serializable {
      * @param coll      数据集合
      * @return children
      */
-    <R> Children notIn(boolean condition, SFunction<R, ?> column, Collection<?> coll);
+    <R> Children notIn(boolean condition, String alias, SFunction<R, ?> column, Collection<?> coll);
 
-    /**
-     * ignore
-     */
-    default <R> Children notIn(SFunction<R, ?> column, Object... value) {
-        return notIn(true, column, value);
+
+    default <R> Children notIn(SFunction<R, ?> column, Object... values) {
+        return notIn(true, null, column, values);
+    }
+
+    default <R> Children notIn(String alias, SFunction<R, ?> column, Object... values) {
+        return notIn(true, alias, column, values);
+    }
+
+    default <R> Children notIn(boolean condition, SFunction<R, ?> column, Object... values) {
+        return notIn(condition, null, column, values);
     }
 
     /**
@@ -126,13 +161,19 @@ public interface Func<Children> extends Serializable {
      * @param values    数据数组
      * @return children
      */
-    <R> Children notIn(boolean condition, SFunction<R, ?> column, Object... values);
+    <R> Children notIn(boolean condition, String alias, SFunction<R, ?> column, Object... values);
+
 
-    /**
-     * ignore
-     */
     default <R> Children inSql(SFunction<R, ?> column, String inValue) {
-        return inSql(true, column, inValue);
+        return inSql(true, null, column, inValue);
+    }
+
+    default <R> Children inSql(String alias, SFunction<R, ?> column, String inValue) {
+        return inSql(true, alias, column, inValue);
+    }
+
+    default <R> Children inSql(boolean condition, SFunction<R, ?> column, String inValue) {
+        return inSql(condition, null, column, inValue);
     }
 
     /**
@@ -146,13 +187,19 @@ public interface Func<Children> extends Serializable {
      * @param inValue   sql语句
      * @return children
      */
-    <R> Children inSql(boolean condition, SFunction<R, ?> column, String inValue);
+    <R> Children inSql(boolean condition, String alias, SFunction<R, ?> column, String inValue);
+
 
-    /**
-     * ignore
-     */
     default <R> Children notInSql(SFunction<R, ?> column, String inValue) {
-        return notInSql(true, column, inValue);
+        return notInSql(true, null, column, inValue);
+    }
+
+    default <R> Children notInSql(String alias, SFunction<R, ?> column, String inValue) {
+        return notInSql(true, alias, column, inValue);
+    }
+
+    default <R> Children notInSql(boolean condition, SFunction<R, ?> column, String inValue) {
+        return notInSql(condition, null, column, inValue);
     }
 
     /**
@@ -166,26 +213,42 @@ public interface Func<Children> extends Serializable {
      * @param inValue   sql语句 ---&gt; 1,2,3,4,5,6 或者 select id from table where id &lt; 3
      * @return children
      */
-    <R> Children notInSql(boolean condition, SFunction<R, ?> column, String inValue);
+    <R> Children notInSql(boolean condition, String alias, SFunction<R, ?> column, String inValue);
 
+    default <R> Children gtSql(SFunction<R, ?> column, String inValue) {
+        return gtSql(true, null, column, inValue);
+    }
+
+    default <R> Children gtSql(String alias, SFunction<R, ?> column, String inValue) {
+        return gtSql(true, alias, column, inValue);
+    }
+
+    default <R> Children gtSql(boolean condition, SFunction<R, ?> column, String inValue) {
+        return gtSql(condition, null, column, inValue);
+    }
 
     /**
      * 字段 &gt; ( sql语句 )
      * <p>例1: gtSql("id", "1, 2, 3, 4, 5, 6")</p>
      * <p>例1: gtSql("id", "select id from table where name = 'JunJun'")</p>
      *
-     * @param condition
-     * @param column
-     * @param inValue
-     * @return
+     * @param condition 执行条件
+     * @param column    字段
+     * @param inValue   sql语句 ---&gt; 1,2,3,4,5,6 或者 select id from table where id &lt; 3
+     * @return children
      */
-    <R> Children gtSql(boolean condition, SFunction<R, ?> column, String inValue);
+    <R> Children gtSql(boolean condition, String alias, SFunction<R, ?> column, String inValue);
 
-    /**
-     * ignore
-     */
-    default <R> Children gtSql(SFunction<R, ?> column, String inValue) {
-        return gtSql(true, column, inValue);
+    default <R> Children geSql(SFunction<R, ?> column, String inValue) {
+        return geSql(true, null, column, inValue);
+    }
+
+    default <R> Children geSql(String alias, SFunction<R, ?> column, String inValue) {
+        return geSql(true, alias, column, inValue);
+    }
+
+    default <R> Children geSql(boolean condition, SFunction<R, ?> column, String inValue) {
+        return geSql(condition, null, column, inValue);
     }
 
     /**
@@ -193,18 +256,23 @@ public interface Func<Children> extends Serializable {
      * <p>例1: geSql("id", "1, 2, 3, 4, 5, 6")</p>
      * <p>例1: geSql("id", "select id from table where name = 'JunJun'")</p>
      *
-     * @param condition
-     * @param column
-     * @param inValue
-     * @return
+     * @param condition 执行条件
+     * @param column    字段
+     * @param inValue   sql语句 ---&gt; 1,2,3,4,5,6 或者 select id from table where id &lt; 3
+     * @return children
      */
-    <R> Children geSql(boolean condition, SFunction<R, ?> column, String inValue);
+    <R> Children geSql(boolean condition, String alias, SFunction<R, ?> column, String inValue);
 
-    /**
-     * ignore
-     */
-    default <R> Children geSql(SFunction<R, ?> column, String inValue) {
-        return geSql(true, column, inValue);
+    default <R> Children ltSql(SFunction<R, ?> column, String inValue) {
+        return ltSql(true, null, column, inValue);
+    }
+
+    default <R> Children ltSql(String alias, SFunction<R, ?> column, String inValue) {
+        return ltSql(true, alias, column, inValue);
+    }
+
+    default <R> Children ltSql(boolean condition, SFunction<R, ?> column, String inValue) {
+        return ltSql(condition, null, column, inValue);
     }
 
     /**
@@ -212,18 +280,23 @@ public interface Func<Children> extends Serializable {
      * <p>例1: ltSql("id", "1, 2, 3, 4, 5, 6")</p>
      * <p>例1: ltSql("id", "select id from table where name = 'JunJun'")</p>
      *
-     * @param condition
-     * @param column
-     * @param inValue
-     * @return
+     * @param condition 执行条件
+     * @param column    字段
+     * @param inValue   sql语句 ---&gt; 1,2,3,4,5,6 或者 select id from table where id &lt; 3
+     * @return children
      */
-    <R> Children ltSql(boolean condition, SFunction<R, ?> column, String inValue);
+    <R> Children ltSql(boolean condition, String alias, SFunction<R, ?> column, String inValue);
 
-    /**
-     * ignore
-     */
-    default <R> Children ltSql(SFunction<R, ?> column, String inValue) {
-        return ltSql(true, column, inValue);
+    default <R> Children leSql(SFunction<R, ?> column, String inValue) {
+        return leSql(true, null, column, inValue);
+    }
+
+    default <R> Children leSql(String alias, SFunction<R, ?> column, String inValue) {
+        return leSql(true, alias, column, inValue);
+    }
+
+    default <R> Children leSql(boolean condition, SFunction<R, ?> column, String inValue) {
+        return leSql(condition, null, column, inValue);
     }
 
     /**
@@ -231,44 +304,47 @@ public interface Func<Children> extends Serializable {
      * <p>例1: leSql("id", "1, 2, 3, 4, 5, 6")</p>
      * <p>例1: leSql("id", "select id from table where name = 'JunJun'")</p>
      *
-     * @param condition
-     * @param column
-     * @param inValue
-     * @return
+     * @param condition 执行条件
+     * @param column    字段
+     * @param inValue   sql语句 ---&gt; 1,2,3,4,5,6 或者 select id from table where id &lt; 3
+     * @return children
      */
-    <R> Children leSql(boolean condition, SFunction<R, ?> column, String inValue);
+    <R> Children leSql(boolean condition, String alias, SFunction<R, ?> column, String inValue);
 
-    /**
-     * ignore
-     */
-    default <R> Children leSql(SFunction<R, ?> column, String inValue) {
-        return leSql(true, column, inValue);
-    }
-
-    /**
-     * ignore
-     */
     default <R> Children groupBy(SFunction<R, ?> column) {
-        return groupBy(true, column);
+        return groupBy(true, (String) null, column);
+    }
+
+    default <R> Children groupBy(String alias, SFunction<R, ?> column) {
+        return groupBy(true, alias, column);
     }
 
-    /**
-     * ignore
-     */
     default <R> Children groupBy(List<SFunction<R, ?>> column) {
-        return groupBy(true, column);
+        return groupBy(true, null, column);
     }
 
-    /**
-     * ignore
-     */
-    <R> Children groupBy(boolean condition, List<SFunction<R, ?>> columns);
+    default <R> Children groupBy(String alias, List<SFunction<R, ?>> column) {
+        return groupBy(true, alias, column);
+    }
+
+    default <R> Children groupBy(boolean condition, List<SFunction<R, ?>> columns) {
+        return groupBy(condition, null, columns);
+    }
+
+
+    <R> Children groupBy(boolean condition, String alias, List<SFunction<R, ?>> columns);
+
 
-    /**
-     * ignore
-     */
     default <R> Children groupBy(SFunction<R, ?> column, SFunction<R, ?>... columns) {
-        return groupBy(true, column, columns);
+        return groupBy(true, null, column, columns);
+    }
+
+    default <R> Children groupBy(String alias, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return groupBy(true, alias, column, columns);
+    }
+
+    default <R> Children groupBy(boolean condition, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return groupBy(condition, null, column, columns);
     }
 
     /**
@@ -280,32 +356,42 @@ public interface Func<Children> extends Serializable {
      * @param columns   字段数组
      * @return children
      */
-    <R> Children groupBy(boolean condition, SFunction<R, ?> column, SFunction<R, ?>... columns);
+    <R> Children groupBy(boolean condition, String alias, SFunction<R, ?> column, SFunction<R, ?>... columns);
+
 
-    /**
-     * ignore
-     */
     default <R> Children orderByAsc(SFunction<R, ?> column) {
-        return orderByAsc(true, column);
+        return orderByAsc(true, (String) null, column);
+    }
+
+    default <R> Children orderByAsc(String alias, SFunction<R, ?> column) {
+        return orderByAsc(true, alias, column);
     }
 
-    /**
-     * ignore
-     */
     default <R> Children orderByAsc(List<SFunction<R, ?>> columns) {
-        return orderByAsc(true, columns);
+        return orderByAsc(true, null, columns);
     }
 
-    /**
-     * ignore
-     */
-    <R> Children orderByAsc(boolean condition, List<SFunction<R, ?>> columns);
+    default <R> Children orderByAsc(String alias, List<SFunction<R, ?>> columns) {
+        return orderByAsc(true, alias, columns);
+    }
+
+    default <R> Children orderByAsc(boolean condition, List<SFunction<R, ?>> columns) {
+        return orderByAsc(condition, null, columns);
+    }
+
+    <R> Children orderByAsc(boolean condition, String alias, List<SFunction<R, ?>> columns);
+
 
-    /**
-     * ignore
-     */
     default <R> Children orderByAsc(SFunction<R, ?> column, SFunction<R, ?>... columns) {
-        return orderByAsc(true, column, columns);
+        return orderByAsc(true, null, column, columns);
+    }
+
+    default <R> Children orderByAsc(String alias, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderByAsc(true, alias, column, columns);
+    }
+
+    default <R> Children orderByAsc(boolean condition, String alias, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderBy(condition, true, alias, column, columns);
     }
 
     /**
@@ -318,33 +404,44 @@ public interface Func<Children> extends Serializable {
      * @return children
      */
     default <R> Children orderByAsc(boolean condition, SFunction<R, ?> column, SFunction<R, ?>... columns) {
-        return orderBy(condition, true, column, columns);
+        return orderBy(condition, true, null, column, columns);
     }
 
-    /**
-     * ignore
-     */
+
     default <R> Children orderByDesc(SFunction<R, ?> column) {
-        return orderByDesc(true, column);
+        return orderByDesc(true, (String) null, column);
     }
 
-    /**
-     * ignore
-     */
+    default <R> Children orderByDesc(String alias, SFunction<R, ?> column) {
+        return orderByDesc(true, alias, column);
+    }
+
+
     default <R> Children orderByDesc(List<SFunction<R, ?>> columns) {
-        return orderByDesc(true, columns);
+        return orderByDesc(true, null, columns);
     }
 
-    /**
-     * ignore
-     */
-    <R> Children orderByDesc(boolean condition, List<SFunction<R, ?>> columns);
+    default <R> Children orderByDesc(String alias, List<SFunction<R, ?>> columns) {
+        return orderByDesc(true, alias, columns);
+    }
+
+    default <R> Children orderByDesc(boolean condition, List<SFunction<R, ?>> columns) {
+        return orderByDesc(condition, null, columns);
+    }
+
+    <R> Children orderByDesc(boolean condition, String alias, List<SFunction<R, ?>> columns);
+
 
-    /**
-     * ignore
-     */
     default <R> Children orderByDesc(SFunction<R, ?> column, SFunction<R, ?>... columns) {
-        return orderByDesc(true, column, columns);
+        return orderByDesc(true, null, column, columns);
+    }
+
+    default <R> Children orderByDesc(String alias, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderByDesc(true, alias, column, columns);
+    }
+
+    default <R> Children orderByDesc(boolean condition, String alias, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderBy(condition, false, alias, column, columns);
     }
 
     /**
@@ -357,7 +454,11 @@ public interface Func<Children> extends Serializable {
      * @return children
      */
     default <R> Children orderByDesc(boolean condition, SFunction<R, ?> column, SFunction<R, ?>... columns) {
-        return orderBy(condition, false, column, columns);
+        return orderBy(condition, false, null, column, columns);
+    }
+
+    default <R> Children orderBy(boolean condition, boolean isAsc, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderBy(condition, isAsc, null, column, columns);
     }
 
     /**
@@ -370,11 +471,9 @@ public interface Func<Children> extends Serializable {
      * @param columns   字段数组
      * @return children
      */
-    <R> Children orderBy(boolean condition, boolean isAsc, SFunction<R, ?> column, SFunction<R, ?>... columns);
+    <R> Children orderBy(boolean condition, boolean isAsc, String alias, SFunction<R, ?> column, SFunction<R, ?>... columns);
+
 
-    /**
-     * ignore
-     */
     default Children having(String sqlHaving, Object... params) {
         return having(true, sqlHaving, params);
     }
@@ -391,9 +490,7 @@ public interface Func<Children> extends Serializable {
      */
     Children having(boolean condition, String sqlHaving, Object... params);
 
-    /**
-     * ignore
-     */
+
     default Children func(Consumer<Children> consumer) {
         return func(true, consumer);
     }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/OnCompare.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/OnCompare.java
index 0906cea..c12017c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/OnCompare.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/OnCompare.java
@@ -14,13 +14,36 @@ import java.io.Serializable;
  */
 @SuppressWarnings("unused")
 public interface OnCompare<Children> extends Serializable {
-    /**
-     * ignore
-     */
+
     default <R, S> Children eq(SFunction<R, ?> column, SFunction<S, ?> val) {
         return eq(true, column, val);
     }
 
+
+    default <R, S> Children eq(String alias, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return eq(true, alias, column, val);
+    }
+
+    default <R, S> Children eq(SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return eq(true, column, rightAlias, val);
+    }
+
+    default <R, S> Children eq(String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return eq(true, alias, column, rightAlias, val);
+    }
+
+    default <R, S> Children eq(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return eq(condition, null, column, null, val);
+    }
+
+    default <R, S> Children eq(boolean condition, String alias, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return eq(condition, alias, column, null, val);
+    }
+
+    default <R, S> Children eq(boolean condition, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return eq(condition, null, column, rightAlias, val);
+    }
+
     /**
      * 等于 =
      *
@@ -29,13 +52,34 @@ public interface OnCompare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R, S> Children eq(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val);
+    <R, S> Children eq(boolean condition, String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val);
 
-    /**
-     * ignore
-     */
     default <R, S> Children ne(SFunction<R, ?> column, SFunction<S, ?> val) {
-        return ne(true, column, val);
+        return ne(true, null, column, null, val);
+    }
+
+    default <R, S> Children ne(String alias, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return ne(true, alias, column, null, val);
+    }
+
+    default <R, S> Children ne(SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return ne(true, null, column, rightAlias, val);
+    }
+
+    default <R, S> Children ne(String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return ne(true, alias, column, rightAlias, val);
+    }
+
+    default <R, S> Children ne(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return ne(condition, null, column, null, val);
+    }
+
+    default <R, S> Children ne(boolean condition, String alias, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return ne(condition, alias, column, null, val);
+    }
+
+    default <R, S> Children ne(boolean condition, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return ne(condition, null, column, rightAlias, val);
     }
 
     /**
@@ -46,13 +90,34 @@ public interface OnCompare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R, S> Children ne(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val);
+    <R, S> Children ne(boolean condition, String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val);
 
-    /**
-     * ignore
-     */
     default <R, S> Children gt(SFunction<R, ?> column, SFunction<S, ?> val) {
-        return gt(true, column, val);
+        return gt(true, null, column, null, val);
+    }
+
+    default <R, S> Children gt(String alias, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return gt(true, alias, column, null, val);
+    }
+
+    default <R, S> Children gt(SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return gt(true, null, column, rightAlias, val);
+    }
+
+    default <R, S> Children gt(String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return gt(true, alias, column, rightAlias, val);
+    }
+
+    default <R, S> Children gt(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return gt(condition, null, column, null, val);
+    }
+
+    default <R, S> Children gt(boolean condition, String alias, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return gt(condition, alias, column, null, val);
+    }
+
+    default <R, S> Children gt(boolean condition, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return gt(condition, null, column, rightAlias, val);
     }
 
     /**
@@ -63,13 +128,34 @@ public interface OnCompare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R, S> Children gt(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val);
+    <R, S> Children gt(boolean condition, String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val);
 
-    /**
-     * ignore
-     */
     default <R, S> Children ge(SFunction<R, ?> column, SFunction<S, ?> val) {
-        return ge(true, column, val);
+        return ge(true, null, column, null, val);
+    }
+
+    default <R, S> Children ge(String alias, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return ge(true, alias, column, null, val);
+    }
+
+    default <R, S> Children ge(SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return ge(true, null, column, rightAlias, val);
+    }
+
+    default <R, S> Children ge(String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return ge(true, alias, column, rightAlias, val);
+    }
+
+    default <R, S> Children ge(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return ge(condition, null, column, null, val);
+    }
+
+    default <R, S> Children ge(boolean condition, String alias, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return ge(condition, alias, column, null, val);
+    }
+
+    default <R, S> Children ge(boolean condition, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return ge(condition, null, column, rightAlias, val);
     }
 
     /**
@@ -80,13 +166,34 @@ public interface OnCompare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R, S> Children ge(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val);
+    <R, S> Children ge(boolean condition, String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val);
 
-    /**
-     * ignore
-     */
     default <R, S> Children lt(SFunction<R, ?> column, SFunction<S, ?> val) {
-        return lt(true, column, val);
+        return lt(true, null, column, null, val);
+    }
+
+    default <R, S> Children lt(String alias, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return lt(true, alias, column, null, val);
+    }
+
+    default <R, S> Children lt(SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return lt(true, null, column, rightAlias, val);
+    }
+
+    default <R, S> Children lt(String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return lt(true, alias, column, rightAlias, val);
+    }
+
+    default <R, S> Children lt(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return lt(condition, null, column, null, val);
+    }
+
+    default <R, S> Children lt(boolean condition, String alias, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return lt(condition, alias, column, null, val);
+    }
+
+    default <R, S> Children lt(boolean condition, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return lt(condition, null, column, rightAlias, val);
     }
 
     /**
@@ -97,13 +204,34 @@ public interface OnCompare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R, S> Children lt(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val);
+    <R, S> Children lt(boolean condition, String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val);
 
-    /**
-     * ignore
-     */
     default <R, S> Children le(SFunction<R, ?> column, SFunction<S, ?> val) {
-        return le(true, column, val);
+        return le(true, null, column, null, val);
+    }
+
+    default <R, S> Children le(String alias, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return le(true, alias, column, null, val);
+    }
+
+    default <R, S> Children le(SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return le(true, null, column, rightAlias, val);
+    }
+
+    default <R, S> Children le(String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return le(true, alias, column, rightAlias, val);
+    }
+
+    default <R, S> Children le(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return le(condition, null, column, null, val);
+    }
+
+    default <R, S> Children le(boolean condition, String alias, SFunction<R, ?> column, SFunction<S, ?> val) {
+        return le(condition, alias, column, null, val);
+    }
+
+    default <R, S> Children le(boolean condition, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val) {
+        return le(condition, null, column, rightAlias, val);
     }
 
     /**
@@ -114,5 +242,5 @@ public interface OnCompare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    <R, S> Children le(boolean condition, SFunction<R, ?> column, SFunction<S, ?> val);
+    <R, S> Children le(boolean condition, String alias, SFunction<R, ?> column, String rightAlias, SFunction<S, ?> val);
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/QueryJoin.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/QueryJoin.java
index f4abfac..ddeece3 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/QueryJoin.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/QueryJoin.java
@@ -25,6 +25,18 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(Constant.LEFT_JOIN, clazz, left, right);
     }
 
+    /**
+     * left join
+     *
+     * @param clazz      关联的实体类
+     * @param left       条件
+     * @param rightAlias 条件字段别名
+     * @param right      条件
+     */
+    default <T, X> Children leftJoin(Class<T> clazz, SFunction<T, ?> left, String rightAlias, SFunction<X, ?> right) {
+        return join(Constant.LEFT_JOIN, clazz, left, rightAlias, right);
+    }
+
     /**
      * left join 多条件
      * <p>
@@ -71,6 +83,18 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(Constant.LEFT_JOIN, clazz, alias, left, right);
     }
 
+    /**
+     * left join
+     *
+     * @param clazz      关联的实体类
+     * @param rightAlias 条件字段别名
+     * @param left       条件
+     * @param right      条件
+     */
+    default <T, X> Children leftJoin(Class<T> clazz, String alias, SFunction<T, ?> left, String rightAlias, SFunction<X, ?> right) {
+        return join(Constant.LEFT_JOIN, clazz, alias, left, rightAlias, right);
+    }
+
     /**
      * left join 多条件
      * <p>
@@ -111,6 +135,14 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
      */
     default <T, X> Children rightJoin(Class<T> clazz, SFunction<T, ?> left, SFunction<X, ?> right) {
         return join(Constant.RIGHT_JOIN, clazz, left, right);
+
+    }
+
+    /**
+     * ignore 参考 left join
+     */
+    default <T, X> Children rightJoin(Class<T> clazz, SFunction<T, ?> left, String rightAlias, SFunction<X, ?> right) {
+        return join(Constant.RIGHT_JOIN, clazz, left, rightAlias, right);
     }
 
     /**
@@ -137,8 +169,8 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T, X> Children rightJoin(Class<T> clazz, String alias, SFunction<T, ?> left, SFunction<X, ?> right) {
-        return join(Constant.RIGHT_JOIN, clazz, alias, left, right);
+    default <T, X> Children rightJoin(Class<T> clazz, String alias, SFunction<T, ?> left, String rightAlias, SFunction<X, ?> right) {
+        return join(Constant.RIGHT_JOIN, clazz, alias, left, rightAlias, right);
     }
 
     /**
@@ -167,7 +199,14 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
      * ignore 参考 left join
      */
     default <T, X> Children innerJoin(Class<T> clazz, SFunction<T, ?> left, SFunction<X, ?> right) {
-        return join(Constant.INNER_JOIN, clazz, on -> on.eq(left, right));
+        return join(Constant.INNER_JOIN, clazz, left, right);
+    }
+
+    /**
+     * ignore 参考 left join
+     */
+    default <T, X> Children innerJoin(Class<T> clazz, SFunction<T, ?> left, String rightAlias, SFunction<X, ?> right) {
+        return join(Constant.INNER_JOIN, clazz, left, rightAlias, right);
     }
 
     /**
@@ -227,6 +266,13 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(Constant.FULL_JOIN, clazz, left, right);
     }
 
+    /**
+     * ignore 参考 left join
+     */
+    default <T, X> Children fullJoin(Class<T> clazz, SFunction<T, ?> left, String rightAlias, SFunction<X, ?> right) {
+        return join(Constant.FULL_JOIN, clazz, left, rightAlias, right);
+    }
+
     /**
      * ignore 参考 left join
      */
@@ -255,6 +301,13 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(Constant.FULL_JOIN, clazz, alias, left, right);
     }
 
+    /**
+     * ignore 参考 left join
+     */
+    default <T, X> Children fullJoin(Class<T> clazz, String alias, SFunction<T, ?> left, String rightAlias, SFunction<X, ?> right) {
+        return join(Constant.FULL_JOIN, clazz, alias, left, rightAlias, right);
+    }
+
     /**
      * ignore 参考 left join
      */
@@ -291,6 +344,20 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(keyWord, clazz, on -> on.eq(left, right));
     }
 
+    /**
+     * 自定义连表关键词
+     * <p>
+     * 查询基类 可以直接调用此方法实现以上所有功能
+     *
+     * @param keyWord 连表关键字
+     * @param clazz   连表实体类
+     * @param left    关联条件
+     * @param right   扩展 用于关联表的 select 和 where
+     */
+    default <T, X> Children join(String keyWord, Class<T> clazz, SFunction<T, ?> left, String rightAlias, SFunction<X, ?> right) {
+        return join(keyWord, clazz, on -> on.eq(left, rightAlias,right));
+    }
+
     /**
      * 自定义连表关键词
      * <p>
@@ -332,6 +399,21 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(keyWord, clazz, alias, on -> on.eq(left, right));
     }
 
+    /**
+     * 自定义连表关键词
+     * 调用此方法 keyword 前后需要带空格 比如 " LEFT JOIN "  " RIGHT JOIN "
+     * <p>
+     * 查询基类 可以直接调用此方法实现以上所有功能
+     *
+     * @param keyWord 连表关键字
+     * @param clazz   连表实体类
+     * @param left    关联条件
+     * @param right   扩展 用于关联表的 select 和 where
+     */
+    default <T, X> Children join(String keyWord, Class<T> clazz, String alias, SFunction<T, ?> left, String rightAlias, SFunction<X, ?> right) {
+        return join(keyWord, clazz, alias, on -> on.eq(left, rightAlias, right));
+    }
+
     /**
      * 自定义连表关键词
      * <p>
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/TableAliasTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/TableAliasTest.java
new file mode 100644
index 0000000..d1fb385
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/TableAliasTest.java
@@ -0,0 +1,87 @@
+package com.github.yulichang.test.join.m;
+
+import com.github.yulichang.test.join.entity.AddressDO;
+import com.github.yulichang.test.join.entity.AreaDO;
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.join.mapper.UserMapper;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+@SpringBootTest
+public class TableAliasTest {
+    @Autowired
+    private UserMapper userMapper;
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+    @Test
+    void tableAlias() {
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
+                "LEFT JOIN address addr1 ON (addr1.id = t.address_id) " +
+                "LEFT JOIN address addr2 ON (addr2.id = t.address_id2) " +
+                "LEFT JOIN area area1 ON (area1.id = addr1.area_id) " +
+                "WHERE t.del = false AND addr1.del = false AND addr2.del = false AND area1.del = false " +
+                "GROUP BY t.id");
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .leftJoin(AddressDO.class, "addr1", AddressDO::getId, UserDO::getAddressId)
+                .leftJoin(AddressDO.class, "addr2", AddressDO::getId, UserDO::getAddressId2)
+                .leftJoin(AreaDO.class, "area1", AreaDO::getId, "addr1", AddressDO::getAreaId)
+                .groupBy(UserDO::getId);
+
+        List<UserDO> dos = userMapper.selectJoinList(UserDO.class, wrapper);
+        dos.forEach(System.out::println);
+    }
+
+    @Test
+    void tableAlias2() {
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
+                "LEFT JOIN address addr1 ON (addr1.id = t.address_id) " +
+                "LEFT JOIN address addr2 ON (addr2.id = t.address_id2) " +
+                "LEFT JOIN area area1 ON (area1.id = addr2.area_id) " +
+                "WHERE t.del = false AND addr1.del = false AND addr2.del = false AND area1.del = false " +
+                "GROUP BY t.id ORDER BY addr1.id DESC");
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .leftJoin(AddressDO.class, "addr1", AddressDO::getId, UserDO::getAddressId)
+                .leftJoin(AddressDO.class, "addr2", AddressDO::getId, UserDO::getAddressId2)
+                .leftJoin(AreaDO.class, "area1", AreaDO::getId, "addr2", AddressDO::getAreaId)
+                .groupBy(UserDO::getId)
+                .orderByDesc("addr1", AddressDO::getId);
+
+        List<UserDO> dos = userMapper.selectJoinList(UserDO.class, wrapper);
+        dos.forEach(System.out::println);
+    }
+
+
+    @Test
+    void tableAliasEQ() {
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
+                "LEFT JOIN address addr1 ON (addr1.id = t.address_id) " +
+                "LEFT JOIN address addr2 ON (addr2.id = t.address_id2) " +
+                "LEFT JOIN area area1 ON (area1.id = addr2.area_id) WHERE t.del = false AND addr1.del = false AND addr2.del = false AND area1.del = false " +
+                "AND (addr1.id = ? AND addr2.id = ? AND addr1.id = ?)");
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .leftJoin(AddressDO.class, "addr1", AddressDO::getId, UserDO::getAddressId)
+                .leftJoin(AddressDO.class, "addr2", AddressDO::getId, UserDO::getAddressId2)
+                .leftJoin(AreaDO.class, "area1", AreaDO::getId, "addr2", AddressDO::getAreaId)
+                .eq("addr1", AddressDO::getId, 1)
+                .eq("addr2", AddressDO::getId, 2)
+                .eq("addr1", AddressDO::getId, 3);
+
+        List<UserDO> dos = userMapper.selectJoinList(UserDO.class, wrapper);
+        dos.forEach(System.out::println);
+    }
+}

From 25b3df16cff31568e15fb6572d900f3da6d7046c Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sun, 10 Dec 2023 05:45:42 +0800
Subject: [PATCH 31/88] =?UTF-8?q?=E4=BC=98=E5=8C=96idea=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/kt/KtAbstractLambdaWrapper.java |  10 +-
 .../yulichang/kt/KtAbstractWrapper.java       |  74 ++++++-------
 .../yulichang/wrapper/MPJAbstractWrapper.java | 101 +++++++++++++++++-
 .../yulichang/test/join/m/OrderByTest.java    |  58 ++++++++++
 4 files changed, 197 insertions(+), 46 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/OrderByTest.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java
index b1a6ad8..874577d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java
@@ -43,6 +43,7 @@ public abstract class KtAbstractLambdaWrapper<T, Children extends KtAbstractLamb
     /**
      * 主表别名
      */
+    @Getter
     protected String alias = ConfigProperties.tableAlias;
     /**
      * 副表别名
@@ -222,8 +223,8 @@ public abstract class KtAbstractLambdaWrapper<T, Children extends KtAbstractLamb
     }
 
     @Override
-    protected final String columnsToString(Integer index, boolean isJoin, PrefixEnum prefixEnum, Object... columns) {
-        return Arrays.stream(columns).map(i -> columnToString(index, (KProperty<?>) i, isJoin, prefixEnum)).collect(joining(StringPool.COMMA));
+    protected final String columnsToString(Integer index, PrefixEnum prefixEnum, KProperty<?>... columns) {
+        return Arrays.stream(columns).map(i -> columnToString(index, i, false, prefixEnum)).collect(joining(StringPool.COMMA));
     }
 
     protected String columnToString(Integer index, KProperty<?> column, boolean isJoin, PrefixEnum prefixEnum) {
@@ -337,6 +338,7 @@ public abstract class KtAbstractLambdaWrapper<T, Children extends KtAbstractLamb
                 if (StringUtils.isBlank(wrapper.from.getStringValue())) {
                     if (this.subLogicSql && this.logicDelType == LogicDelTypeEnum.ON) {
                         TableInfo tableInfo = TableHelper.get(wrapper.getJoinClass());
+                        Asserts.hasTable(tableInfo, wrapper.getJoinClass());
                         if (ConfigProperties.tableInfoAdapter.mpjHasLogic(tableInfo)) {
                             wrapper.appendSqlSegments(APPLY, () -> LogicInfoUtils.getLogicInfoNoAnd(
                                     wrapper.getIndex(), wrapper.getJoinClass(), wrapper.isHasAlias(), wrapper.getAlias()
@@ -364,10 +366,6 @@ public abstract class KtAbstractLambdaWrapper<T, Children extends KtAbstractLamb
         return from.getStringValue();
     }
 
-    public String getAlias() {
-        return alias;
-    }
-
     /**
      * 内部调用, 不建议使用
      */
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
index f4299ff..dc913dc 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
@@ -42,7 +42,7 @@ import static java.util.stream.Collectors.joining;
  *
  * @author yulichang
  */
-@SuppressWarnings("ALL")
+@SuppressWarnings({"unused", "unchecked", "DuplicatedCode"})
 public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T, Children>> extends Wrapper<T>
         implements Compare<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
         CompareStr<Children, String>, FuncStr<Children, String> {
@@ -61,6 +61,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      */
     @Getter
     protected AtomicInteger paramNameSeq;
+    @Getter
     protected Map<String, Object> paramNameValuePairs;
     /**
      * 其他
@@ -239,13 +240,13 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
 
     @Override
     public Children between(boolean condition, KProperty<?> column, Object val1, Object val2) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), BETWEEN,
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), BETWEEN,
                 () -> formatParam(null, val1), AND, () -> formatParam(null, val2)));
     }
 
     @Override
     public Children notBetween(boolean condition, KProperty<?> column, Object val1, Object val2) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), NOT_BETWEEN,
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), NOT_BETWEEN,
                 () -> formatParam(null, val1), AND, () -> formatParam(null, val2)));
     }
 
@@ -317,68 +318,68 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
 
     @Override
     public Children isNull(boolean condition, KProperty<?> column) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), IS_NULL));
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), IS_NULL));
     }
 
     @Override
     public Children isNotNull(boolean condition, KProperty<?> column) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), IS_NOT_NULL));
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), IS_NOT_NULL));
     }
 
     @Override
     public Children in(boolean condition, KProperty<?> column, Collection<?> coll) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), IN, inExpression(coll)));
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), IN, inExpression(coll)));
     }
 
     @Override
     public Children in(boolean condition, KProperty<?> column, Object... values) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), IN, inExpression(values)));
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), IN, inExpression(values)));
     }
 
     @Override
     public Children notIn(boolean condition, KProperty<?> column, Collection<?> coll) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), NOT_IN, inExpression(coll)));
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), NOT_IN, inExpression(coll)));
     }
 
     @Override
     public Children notIn(boolean condition, KProperty<?> column, Object... values) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), NOT_IN, inExpression(values)));
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), NOT_IN, inExpression(values)));
     }
 
     @Override
     public Children inSql(boolean condition, KProperty<?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), IN,
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), IN,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
     public Children notInSql(boolean condition, KProperty<?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), NOT_IN,
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), NOT_IN,
                 () -> String.format("(%s)", inValue)));
     }
 
 
     @Override
     public Children gtSql(boolean condition, KProperty<?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), GT,
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), GT,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
     public Children geSql(boolean condition, KProperty<?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), GE,
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), GE,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
     public Children ltSql(boolean condition, KProperty<?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), LT,
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), LT,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
     public Children leSql(boolean condition, KProperty<?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), LE,
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), LE,
                 () -> String.format("(%s)", inValue)));
     }
 
@@ -386,8 +387,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     public Children groupBy(boolean condition, List<KProperty<?>> columns) {
         return maybeDo(condition, () -> {
             if (CollectionUtils.isNotEmpty(columns)) {
-                String one = (StringPool.COMMA + columnsToString(index, false, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, columns));
-                final String finalOne = one;
+                final String finalOne = columnsToString(index, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, columns);
                 appendSqlSegments(GROUP_BY, () -> finalOne);
             }
         });
@@ -398,7 +398,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         return maybeDo(condition, () -> {
             String one = columnToString(index, column, false, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST);
             if (ArrayUtils.isNotEmpty(columns)) {
-                one += (StringPool.COMMA + columnsToString(index, false, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, columns));
+                one += columnsToString(index, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, columns);
             }
             final String finalOne = one;
             appendSqlSegments(GROUP_BY, () -> finalOne);
@@ -408,10 +408,9 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     @Override
     public Children orderByAsc(boolean condition, List<KProperty<?>> columns) {
         return maybeDo(condition, () -> {
-            final SqlKeyword mode = ASC;
             if (CollectionUtils.isNotEmpty(columns)) {
                 columns.forEach(c -> appendSqlSegments(ORDER_BY,
-                        columnToSqlSegment(index, columnSqlInjectFilter(c), false), mode));
+                        columnToSqlSegment(index, columnSqlInjectFilter(c)), ASC));
             }
         });
     }
@@ -419,10 +418,9 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     @Override
     public Children orderByDesc(boolean condition, List<KProperty<?>> columns) {
         return maybeDo(condition, () -> {
-            final SqlKeyword mode = DESC;
             if (CollectionUtils.isNotEmpty(columns)) {
                 columns.forEach(c -> appendSqlSegments(ORDER_BY,
-                        columnToSqlSegment(index, columnSqlInjectFilter(c), false), mode));
+                        columnToSqlSegment(index, columnSqlInjectFilter(c)), DESC));
             }
         });
     }
@@ -431,10 +429,10 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     public Children orderBy(boolean condition, boolean isAsc, KProperty<?> column, KProperty<?>... columns) {
         return maybeDo(condition, () -> {
             final SqlKeyword mode = isAsc ? ASC : DESC;
-            appendSqlSegments(ORDER_BY, columnToSqlSegment(index, column, false), mode);
+            appendSqlSegments(ORDER_BY, columnToSqlSegment(index, column), mode);
             if (ArrayUtils.isNotEmpty(columns)) {
                 Arrays.stream(columns).forEach(c -> appendSqlSegments(ORDER_BY,
-                        columnToSqlSegment(index, columnSqlInjectFilter(c), false), mode));
+                        columnToSqlSegment(index, columnSqlInjectFilter(c)), mode));
             }
         });
     }
@@ -443,7 +441,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      * 字段 SQL 注入过滤处理，子类重写实现过滤逻辑
      *
      * @param column 字段内容
-     * @return
+     * @return Children
      */
     protected KProperty<?> columnSqlInjectFilter(KProperty<?> column) {
         return column;
@@ -481,7 +479,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      * <p>拼接 LIKE 以及 值</p>
      */
     protected Children likeValue(boolean condition, SqlKeyword keyword, KProperty<?> column, Object val, SqlLike sqlLike) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), keyword,
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), keyword,
                 () -> formatParam(null, SqlUtils.concatLike(val, sqlLike))));
     }
 
@@ -499,14 +497,14 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      * @param val        条件值
      */
     protected Children addCondition(boolean condition, KProperty<?> column, SqlKeyword sqlKeyword, Object val) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), sqlKeyword,
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), sqlKeyword,
                 () -> formatParam(null, val)));
     }
 
     protected <X, S> Children addCondition(boolean condition, KProperty<?> column, SqlKeyword sqlKeyword, KProperty<?> val) {
         Class<X> c = (Class<X>) KtUtils.ref(column);
         Class<S> v = (Class<S>) KtUtils.ref(val);
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column, false), sqlKeyword,
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), sqlKeyword,
                 isNo ?
                         columnToSqlSegmentS(index, val, v == c && v == joinClass) :
                         columnToSqlSegmentS(index, val, v == c)
@@ -550,6 +548,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      * @param params  参数
      * @return sql片段
      */
+    @SuppressWarnings("SameParameterValue")
     protected final String formatSqlMaybeWithParam(String sqlStr, String mapping, Object... params) {
         if (StringUtils.isBlank(sqlStr)) {
             // todo 何时会这样?
@@ -671,10 +670,6 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         return expression;
     }
 
-    public Map<String, Object> getParamNameValuePairs() {
-        return paramNameValuePairs;
-    }
-
     public String getParamAlias() {
         return paramAlias.getStringValue() == null ? Constants.WRAPPER : paramAlias.getStringValue();
     }
@@ -685,6 +680,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      * @param paramAlias 参数别名
      * @return Children
      */
+    @SuppressWarnings("UnusedReturnValue")
     public Children setParamAlias(String paramAlias) {
         Assert.notEmpty(paramAlias, "paramAlias can not be empty!");
         this.paramAlias.setStringValue(paramAlias);
@@ -694,8 +690,8 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     /**
      * 获取 columnName
      */
-    protected final ISqlSegment columnToSqlSegment(Integer index, KProperty<?> column, boolean isJoin) {
-        return () -> columnToString(index, column, isJoin, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST);
+    protected final ISqlSegment columnToSqlSegment(Integer index, KProperty<?> column) {
+        return () -> columnToString(index, column, false, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST);
     }
 
     protected final ISqlSegment columnToSqlSegmentS(Integer index, KProperty<?> column, boolean isJoin) {
@@ -740,12 +736,16 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      *
      * @param columns 多字段
      */
-    protected String columnsToString(Integer index, boolean isJoin, PrefixEnum prefixEnum, Object... columns) {
-        return Arrays.stream(columns).map(i -> this.columnToString(index, i, isJoin, prefixEnum)).collect(joining(StringPool.COMMA));
+    protected String columnsToString(Integer index, PrefixEnum prefixEnum, KProperty<?>... columns) {
+        return Arrays.stream(columns).map(i -> this.columnToString(index, i, false, prefixEnum)).collect(joining(StringPool.COMMA));
     }
 
+    protected String columnsToString(Integer index, PrefixEnum prefixEnum, List<KProperty<?>> columns) {
+        return columns.stream().map(i -> this.columnToString(index, i, false, prefixEnum)).collect(joining(StringPool.COMMA));
+    }
+
+    @SuppressWarnings("MethodDoesntCallSuperMethod")
     @Override
-    @SuppressWarnings("all")
     public Children clone() {
         return SerializationUtils.clone(typedThis);
     }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
index dbd1832..d8ee2e4 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
@@ -400,14 +400,32 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     public <R> Children groupBy(boolean condition, String alias, List<SFunction<R, ?>> columns) {
         return maybeDo(condition, () -> {
             if (CollectionUtils.isNotEmpty(columns)) {
-                final String finalOne = (StringPool.COMMA + columnsToString(index, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, alias, columns));
+                final String finalOne =  columnsToString(index, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, alias, columns);
                 appendSqlSegments(GROUP_BY, () -> finalOne);
             }
         });
     }
 
-    @SafeVarargs
     @Override
+    @SafeVarargs
+    public final <R> Children groupBy(SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return groupBy(true, null, column, columns);
+    }
+
+    @Override
+    @SafeVarargs
+    public final <R> Children groupBy(String alias, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return groupBy(true, alias, column, columns);
+    }
+
+    @Override
+    @SafeVarargs
+    public final <R> Children groupBy(boolean condition, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return groupBy(condition, null, column, columns);
+    }
+
+    @Override
+    @SafeVarargs
     public final <X> Children groupBy(boolean condition, String alias, SFunction<X, ?> column, SFunction<X, ?>... columns) {
         return maybeDo(condition, () -> {
             String one = columnToString(index, alias, column, false, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST);
@@ -429,6 +447,39 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
         });
     }
 
+    @Override
+    @SafeVarargs
+    public final <R> Children orderByAsc(SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderByAsc(true, null, column, columns);
+    }
+
+    @Override
+    @SafeVarargs
+    public final <R> Children orderByAsc(String alias, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderByAsc(true, alias, column, columns);
+    }
+
+    @Override
+    @SafeVarargs
+    public final <R> Children orderByAsc(boolean condition, String alias, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderBy(condition, true, alias, column, columns);
+    }
+
+    /**
+     * 排序：ORDER BY 字段, ... ASC
+     * <p>例: orderByAsc("id", "name")</p>
+     *
+     * @param condition 执行条件
+     * @param column    单个字段
+     * @param columns   字段数组
+     * @return children
+     */
+    @Override
+    @SafeVarargs
+    public final <R> Children orderByAsc(boolean condition, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderBy(condition, true, null, column, columns);
+    }
+
     @Override
     public <R> Children orderByDesc(boolean condition, String alias, List<SFunction<R, ?>> columns) {
         return maybeDo(condition, () -> {
@@ -440,7 +491,41 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     }
 
     @Override
-    public <X> Children orderBy(boolean condition, boolean isAsc, String alias, SFunction<X, ?> column, SFunction<X, ?>... columns) {
+    @SafeVarargs
+    public final <R> Children orderByDesc(SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderByDesc(true, null, column, columns);
+    }
+
+    @Override
+    @SafeVarargs
+    public final <R> Children orderByDesc(String alias, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderByDesc(true, alias, column, columns);
+    }
+
+    @Override
+    @SafeVarargs
+    public final <R> Children orderByDesc(boolean condition, String alias, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderBy(condition, false, alias, column, columns);
+    }
+
+    /**
+     * 排序：ORDER BY 字段, ... DESC
+     * <p>例: orderByDesc("id", "name")</p>
+     *
+     * @param condition 执行条件
+     * @param column    单个字段
+     * @param columns   字段数组
+     * @return children
+     */
+    @Override
+    @SafeVarargs
+    public final <R> Children orderByDesc(boolean condition, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderBy(condition, false, null, column, columns);
+    }
+
+    @Override
+    @SafeVarargs
+    public final <X> Children orderBy(boolean condition, boolean isAsc, String alias, SFunction<X, ?> column, SFunction<X, ?>... columns) {
         return maybeDo(condition, () -> {
             final SqlKeyword mode = isAsc ? ASC : DESC;
             appendSqlSegments(ORDER_BY, columnToSqlSegment(index, alias, column), mode);
@@ -451,6 +536,12 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
         });
     }
 
+    @Override
+    @SafeVarargs
+    public final <R> Children orderBy(boolean condition, boolean isAsc, SFunction<R, ?> column, SFunction<R, ?>... columns) {
+        return orderBy(condition, isAsc, null, column, columns);
+    }
+
     /**
      * 字段 SQL 注入过滤处理，子类重写实现过滤逻辑
      *
@@ -751,6 +842,10 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      */
     abstract <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, X... columns);
 
+    public <X> String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, List<X> columns) {
+        return columns.stream().map(i -> columnToString(index, alias, (SFunction<?, ?>) i, false, prefixEnum)).collect(joining(StringPool.COMMA));
+    }
+
     @Override
     @SuppressWarnings("MethodDoesntCallSuperMethod")
     public Children clone() {
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/OrderByTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/OrderByTest.java
new file mode 100644
index 0000000..f016bd4
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/OrderByTest.java
@@ -0,0 +1,58 @@
+package com.github.yulichang.test.join.m;
+
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.Arrays;
+import java.util.List;
+
+@SpringBootTest
+public class OrderByTest {
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+    @Test
+    void orderBy() {
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by " +
+                "FROM `user` t WHERE t.del = false AND (t.id = ?) ORDER BY t.id ASC, t.`name` ASC, t.pid ASC");
+        List<SFunction<UserDO, ?>> columList = Arrays.asList(UserDO::getId, UserDO::getName, UserDO::getPid);
+
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .eq(UserDO::getId, 1)
+                .orderByAsc(columList);
+
+
+        List<UserDO> list = wrapper.list();
+        list.forEach(System.out::println);
+    }
+
+    @Test
+    void orderBy1() {
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by " +
+                "FROM `user` t WHERE t.del = false AND (t.id = ?) GROUP BY t.id, t.`name`, t.pid");
+        List<SFunction<UserDO, ?>> columList = Arrays.asList(UserDO::getId, UserDO::getName, UserDO::getPid);
+
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .eq(UserDO::getId, 1)
+                .groupBy(columList);
+//                .groupBy(UserDO::getId, UserDO::getName, UserDO::getPid);
+//                .orderByAsc(columList);
+
+
+        List<UserDO> list = wrapper.list();
+        list.forEach(System.out::println);
+    }
+
+}

From 9ce2b519b110e503d5d112b45e712e74735ff68f Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 11 Dec 2023 03:42:50 +0800
Subject: [PATCH 32/88] =?UTF-8?q?=E5=88=AB=E5=90=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/kt/KtAbstractLambdaWrapper.java |  13 +-
 .../yulichang/kt/KtAbstractWrapper.java       | 181 ++++----
 .../yulichang/kt/interfaces/Compare.java      | 228 +++++++----
 .../github/yulichang/kt/interfaces/Func.java  | 386 +++++++++++-------
 .../yulichang/kt/interfaces/OnCompare.java    | 192 +++++++--
 .../yulichang/kt/interfaces/QueryJoin.java    |  79 ++++
 .../yulichang/test/config/MPConfig.java       | 150 -------
 .../test/config/MybatisPlusConfig.java        |  19 +-
 .../yulichang/test/kt/m/CustomWrapperTest.kt  |   3 +-
 .../github/yulichang/test/kt/m/OrderByTest.kt |  49 +++
 .../yulichang/test/kt/m/TableAliasTest.kt     |  88 ++++
 11 files changed, 856 insertions(+), 532 deletions(-)
 delete mode 100644 mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MPConfig.java
 create mode 100644 mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/OrderByTest.kt
 create mode 100644 mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/TableAliasTest.kt

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java
index 874577d..743305f 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java
@@ -218,18 +218,13 @@ public abstract class KtAbstractLambdaWrapper<T, Children extends KtAbstractLamb
     }
 
     @Override
-    protected String columnToString(Integer index, Object column, boolean isJoin, PrefixEnum prefixEnum) {
-        return columnToString(index, (KProperty<?>) column, isJoin, prefixEnum);
+    protected final String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, KProperty<?>... columns) {
+        return Arrays.stream(columns).map(i -> columnToString(index, alias, i, false, prefixEnum)).collect(joining(StringPool.COMMA));
     }
 
-    @Override
-    protected final String columnsToString(Integer index, PrefixEnum prefixEnum, KProperty<?>... columns) {
-        return Arrays.stream(columns).map(i -> columnToString(index, i, false, prefixEnum)).collect(joining(StringPool.COMMA));
-    }
-
-    protected String columnToString(Integer index, KProperty<?> column, boolean isJoin, PrefixEnum prefixEnum) {
+    protected String columnToString(Integer index, String alias, KProperty<?> column, boolean isJoin, PrefixEnum prefixEnum) {
         Class<?> entityClass = KtUtils.ref(column);
-        return getDefault(index, entityClass, isJoin, prefixEnum) + StringPool.DOT + getCache(column).getColumn();
+        return (alias == null ? getDefault(index, entityClass, isJoin, prefixEnum) : alias) + StringPool.DOT + getCache(column).getColumn();
     }
 
     protected SelectCache getCache(KProperty<?> fn) {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
index dc913dc..b5bcb31 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
@@ -189,64 +189,64 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     }
 
     @Override
-    public Children eq(boolean condition, KProperty<?> column, Object val) {
-        return addCondition(condition, column, EQ, val);
+    public Children eq(boolean condition, String alias, KProperty<?> column, Object val) {
+        return addCondition(condition, alias, column, EQ, val);
     }
 
     @Override
-    public Children ne(boolean condition, KProperty<?> column, Object val) {
-        return addCondition(condition, column, NE, val);
+    public Children ne(boolean condition, String alias, KProperty<?> column, Object val) {
+        return addCondition(condition, alias, column, NE, val);
     }
 
     @Override
-    public Children gt(boolean condition, KProperty<?> column, Object val) {
-        return addCondition(condition, column, GT, val);
+    public Children gt(boolean condition, String alias, KProperty<?> column, Object val) {
+        return addCondition(condition, alias, column, GT, val);
     }
 
     @Override
-    public Children ge(boolean condition, KProperty<?> column, Object val) {
-        return addCondition(condition, column, GE, val);
+    public Children ge(boolean condition, String alias, KProperty<?> column, Object val) {
+        return addCondition(condition, alias, column, GE, val);
     }
 
     @Override
-    public Children lt(boolean condition, KProperty<?> column, Object val) {
-        return addCondition(condition, column, LT, val);
+    public Children lt(boolean condition, String alias, KProperty<?> column, Object val) {
+        return addCondition(condition, alias, column, LT, val);
     }
 
     @Override
-    public Children le(boolean condition, KProperty<?> column, Object val) {
-        return addCondition(condition, column, LE, val);
+    public Children le(boolean condition, String alias, KProperty<?> column, Object val) {
+        return addCondition(condition, alias, column, LE, val);
     }
 
     @Override
-    public Children like(boolean condition, KProperty<?> column, Object val) {
-        return likeValue(condition, LIKE, column, val, SqlLike.DEFAULT);
+    public Children like(boolean condition, String alias, KProperty<?> column, Object val) {
+        return likeValue(condition, LIKE, alias, column, val, SqlLike.DEFAULT);
     }
 
     @Override
-    public Children notLike(boolean condition, KProperty<?> column, Object val) {
-        return likeValue(condition, NOT_LIKE, column, val, SqlLike.DEFAULT);
+    public Children notLike(boolean condition, String alias, KProperty<?> column, Object val) {
+        return likeValue(condition, NOT_LIKE, alias, column, val, SqlLike.DEFAULT);
     }
 
     @Override
-    public Children likeLeft(boolean condition, KProperty<?> column, Object val) {
-        return likeValue(condition, LIKE, column, val, SqlLike.LEFT);
+    public Children likeLeft(boolean condition, String alias, KProperty<?> column, Object val) {
+        return likeValue(condition, LIKE, alias, column, val, SqlLike.LEFT);
     }
 
     @Override
-    public Children likeRight(boolean condition, KProperty<?> column, Object val) {
-        return likeValue(condition, LIKE, column, val, SqlLike.RIGHT);
+    public Children likeRight(boolean condition, String alias, KProperty<?> column, Object val) {
+        return likeValue(condition, LIKE, alias, column, val, SqlLike.RIGHT);
     }
 
     @Override
-    public Children between(boolean condition, KProperty<?> column, Object val1, Object val2) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), BETWEEN,
+    public Children between(boolean condition, String alias, KProperty<?> column, Object val1, Object val2) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), BETWEEN,
                 () -> formatParam(null, val1), AND, () -> formatParam(null, val2)));
     }
 
     @Override
-    public Children notBetween(boolean condition, KProperty<?> column, Object val1, Object val2) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), NOT_BETWEEN,
+    public Children notBetween(boolean condition, String alias, KProperty<?> column, Object val1, Object val2) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), NOT_BETWEEN,
                 () -> formatParam(null, val1), AND, () -> formatParam(null, val2)));
     }
 
@@ -317,122 +317,119 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     }
 
     @Override
-    public Children isNull(boolean condition, KProperty<?> column) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), IS_NULL));
+    public Children isNull(boolean condition, String alias, KProperty<?> column) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), IS_NULL));
     }
 
     @Override
-    public Children isNotNull(boolean condition, KProperty<?> column) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), IS_NOT_NULL));
+    public Children isNotNull(boolean condition, String alias, KProperty<?> column) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), IS_NOT_NULL));
     }
 
     @Override
-    public Children in(boolean condition, KProperty<?> column, Collection<?> coll) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), IN, inExpression(coll)));
+    public Children in(boolean condition, String alias, KProperty<?> column, Collection<?> coll) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), IN, inExpression(coll)));
     }
 
     @Override
-    public Children in(boolean condition, KProperty<?> column, Object... values) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), IN, inExpression(values)));
+    public Children in(boolean condition, String alias, KProperty<?> column, Object... values) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), IN, inExpression(values)));
     }
 
     @Override
-    public Children notIn(boolean condition, KProperty<?> column, Collection<?> coll) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), NOT_IN, inExpression(coll)));
+    public Children notIn(boolean condition, String alias, KProperty<?> column, Collection<?> coll) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), NOT_IN, inExpression(coll)));
     }
 
     @Override
-    public Children notIn(boolean condition, KProperty<?> column, Object... values) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), NOT_IN, inExpression(values)));
+    public Children notIn(boolean condition, String alias, KProperty<?> column, Object... values) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), NOT_IN, inExpression(values)));
     }
 
     @Override
-    public Children inSql(boolean condition, KProperty<?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), IN,
+    public Children inSql(boolean condition, String alias, KProperty<?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), IN,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
-    public Children notInSql(boolean condition, KProperty<?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), NOT_IN,
+    public Children notInSql(boolean condition, String alias, KProperty<?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), NOT_IN,
                 () -> String.format("(%s)", inValue)));
     }
 
 
     @Override
-    public Children gtSql(boolean condition, KProperty<?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), GT,
+    public Children gtSql(boolean condition, String alias, KProperty<?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), GT,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
-    public Children geSql(boolean condition, KProperty<?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), GE,
+    public Children geSql(boolean condition, String alias, KProperty<?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), GE,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
-    public Children ltSql(boolean condition, KProperty<?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), LT,
+    public Children ltSql(boolean condition, String alias, KProperty<?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), LT,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
-    public Children leSql(boolean condition, KProperty<?> column, String inValue) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), LE,
+    public Children leSql(boolean condition, String alias, KProperty<?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), LE,
                 () -> String.format("(%s)", inValue)));
     }
 
     @Override
-    public Children groupBy(boolean condition, List<KProperty<?>> columns) {
+    public Children groupBy(boolean condition, String alias, List<KProperty<?>> columns) {
         return maybeDo(condition, () -> {
             if (CollectionUtils.isNotEmpty(columns)) {
-                final String finalOne = columnsToString(index, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, columns);
+                final String finalOne = columnsToString(index, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, alias, columns);
                 appendSqlSegments(GROUP_BY, () -> finalOne);
             }
         });
     }
 
     @Override
-    public Children groupBy(boolean condition, KProperty<?> column, KProperty<?>... columns) {
+    public Children groupBy(boolean condition, String alias, KProperty<?>... columns) {
         return maybeDo(condition, () -> {
-            String one = columnToString(index, column, false, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST);
             if (ArrayUtils.isNotEmpty(columns)) {
-                one += columnsToString(index, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, columns);
+                final String finalOne = columnsToString(index, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, alias, columns);
+                appendSqlSegments(GROUP_BY, () -> finalOne);
             }
-            final String finalOne = one;
-            appendSqlSegments(GROUP_BY, () -> finalOne);
         });
     }
 
     @Override
-    public Children orderByAsc(boolean condition, List<KProperty<?>> columns) {
+    public Children orderByAsc(boolean condition, String alias, List<KProperty<?>> columns) {
         return maybeDo(condition, () -> {
             if (CollectionUtils.isNotEmpty(columns)) {
                 columns.forEach(c -> appendSqlSegments(ORDER_BY,
-                        columnToSqlSegment(index, columnSqlInjectFilter(c)), ASC));
+                        columnToSqlSegment(index, alias, columnSqlInjectFilter(c)), ASC));
             }
         });
     }
 
     @Override
-    public Children orderByDesc(boolean condition, List<KProperty<?>> columns) {
+    public Children orderByDesc(boolean condition, String alias, List<KProperty<?>> columns) {
         return maybeDo(condition, () -> {
             if (CollectionUtils.isNotEmpty(columns)) {
                 columns.forEach(c -> appendSqlSegments(ORDER_BY,
-                        columnToSqlSegment(index, columnSqlInjectFilter(c)), DESC));
+                        columnToSqlSegment(index, alias, columnSqlInjectFilter(c)), DESC));
             }
         });
     }
 
     @Override
-    public Children orderBy(boolean condition, boolean isAsc, KProperty<?> column, KProperty<?>... columns) {
+    public Children orderBy(boolean condition, boolean isAsc, String alias, KProperty<?>... columns) {
         return maybeDo(condition, () -> {
             final SqlKeyword mode = isAsc ? ASC : DESC;
-            appendSqlSegments(ORDER_BY, columnToSqlSegment(index, column), mode);
             if (ArrayUtils.isNotEmpty(columns)) {
                 Arrays.stream(columns).forEach(c -> appendSqlSegments(ORDER_BY,
-                        columnToSqlSegment(index, columnSqlInjectFilter(c)), mode));
+                        columnToSqlSegment(index, alias, columnSqlInjectFilter(c)), mode));
             }
         });
     }
@@ -478,8 +475,8 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      * 内部自用
      * <p>拼接 LIKE 以及 值</p>
      */
-    protected Children likeValue(boolean condition, SqlKeyword keyword, KProperty<?> column, Object val, SqlLike sqlLike) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), keyword,
+    protected Children likeValue(boolean condition, SqlKeyword keyword, String alias, KProperty<?> column, Object val, SqlLike sqlLike) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), keyword,
                 () -> formatParam(null, SqlUtils.concatLike(val, sqlLike))));
     }
 
@@ -496,18 +493,18 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      * @param sqlKeyword SQL 关键词
      * @param val        条件值
      */
-    protected Children addCondition(boolean condition, KProperty<?> column, SqlKeyword sqlKeyword, Object val) {
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), sqlKeyword,
+    protected Children addCondition(boolean condition, String alias, KProperty<?> column, SqlKeyword sqlKeyword, Object val) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), sqlKeyword,
                 () -> formatParam(null, val)));
     }
 
-    protected <X, S> Children addCondition(boolean condition, KProperty<?> column, SqlKeyword sqlKeyword, KProperty<?> val) {
+    protected <X, S> Children addCondition(boolean condition, String alias, KProperty<?> column, SqlKeyword sqlKeyword, String rightAlias, KProperty<?> val) {
         Class<X> c = (Class<X>) KtUtils.ref(column);
         Class<S> v = (Class<S>) KtUtils.ref(val);
-        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, column), sqlKeyword,
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), sqlKeyword,
                 isNo ?
-                        columnToSqlSegmentS(index, val, v == c && v == joinClass) :
-                        columnToSqlSegmentS(index, val, v == c)
+                        columnToSqlSegmentS(index, rightAlias, val, v == c && v == joinClass) :
+                        columnToSqlSegmentS(index, rightAlias, val, v == c)
         ));
     }
 
@@ -690,18 +687,18 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     /**
      * 获取 columnName
      */
-    protected final ISqlSegment columnToSqlSegment(Integer index, KProperty<?> column) {
-        return () -> columnToString(index, column, false, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST);
+    protected final ISqlSegment columnToSqlSegment(Integer index, String alias, KProperty<?> column) {
+        return () -> columnToString(index, alias, column, false, isNo ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST);
     }
 
-    protected final ISqlSegment columnToSqlSegmentS(Integer index, KProperty<?> column, boolean isJoin) {
+    protected final ISqlSegment columnToSqlSegmentS(Integer index, String alias, KProperty<?> column, boolean isJoin) {
         PrefixEnum prefixEnum;
         if (isMain) {
             prefixEnum = isNo ? PrefixEnum.ON_SECOND /* 理论上不可能有这种情况 */ : PrefixEnum.CD_SECOND;
         } else {
             prefixEnum = isNo ? PrefixEnum.ON_SECOND : PrefixEnum.CD_ON_SECOND;
         }
-        return () -> columnToString(index, column, isJoin, prefixEnum);
+        return () -> columnToString(index, alias, column, isJoin, prefixEnum);
     }
 
     protected final ISqlSegment columnToSqlSegment(String column) {
@@ -711,9 +708,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     /**
      * 获取 columnName
      */
-    protected String columnToString(Integer index, Object column, boolean isJoin, PrefixEnum prefixEnum) {
-        return (String) column;
-    }
+    abstract String columnToString(Integer index, String alias, KProperty<?> column, boolean isJoin, PrefixEnum prefixEnum);
 
     protected String columnToString(String column) {
         if (checkSqlInjection && MPJSqlInjectionUtils.check(column)) {
@@ -736,12 +731,12 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      *
      * @param columns 多字段
      */
-    protected String columnsToString(Integer index, PrefixEnum prefixEnum, KProperty<?>... columns) {
-        return Arrays.stream(columns).map(i -> this.columnToString(index, i, false, prefixEnum)).collect(joining(StringPool.COMMA));
+    protected String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, KProperty<?>... columns) {
+        return Arrays.stream(columns).map(i -> this.columnToString(index, alias, i, false, prefixEnum)).collect(joining(StringPool.COMMA));
     }
 
-    protected String columnsToString(Integer index, PrefixEnum prefixEnum, List<KProperty<?>> columns) {
-        return columns.stream().map(i -> this.columnToString(index, i, false, prefixEnum)).collect(joining(StringPool.COMMA));
+    protected String columnsToString(Integer index, PrefixEnum prefixEnum, String alias, List<KProperty<?>> columns) {
+        return columns.stream().map(i -> this.columnToString(index, alias, i, false, prefixEnum)).collect(joining(StringPool.COMMA));
     }
 
     @SuppressWarnings("MethodDoesntCallSuperMethod")
@@ -762,33 +757,33 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     /* ************************* on语句重载 *************************** */
 
     @Override
-    public Children eq(boolean condition, KProperty<?> column, KProperty<?> val) {
-        return addCondition(condition, column, EQ, val);
+    public Children eq(boolean condition, String alias, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return addCondition(condition, alias, column, EQ, rightAlias, val);
     }
 
     @Override
-    public Children ne(boolean condition, KProperty<?> column, KProperty<?> val) {
-        return addCondition(condition, column, NE, val);
+    public Children ne(boolean condition, String alias, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return addCondition(condition, alias, column, NE, rightAlias, val);
     }
 
     @Override
-    public Children gt(boolean condition, KProperty<?> column, KProperty<?> val) {
-        return addCondition(condition, column, GT, val);
+    public Children gt(boolean condition, String alias, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return addCondition(condition, alias, column, GT, rightAlias, val);
     }
 
     @Override
-    public Children ge(boolean condition, KProperty<?> column, KProperty<?> val) {
-        return addCondition(condition, column, GE, val);
+    public Children ge(boolean condition, String alias, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return addCondition(condition, alias, column, GE, rightAlias, val);
     }
 
     @Override
-    public Children lt(boolean condition, KProperty<?> column, KProperty<?> val) {
-        return addCondition(condition, column, LT, val);
+    public Children lt(boolean condition, String alias, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return addCondition(condition, alias, column, LT, rightAlias, val);
     }
 
     @Override
-    public Children le(boolean condition, KProperty<?> column, KProperty<?> val) {
-        return addCondition(condition, column, LE, val);
+    public Children le(boolean condition, String alias, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return addCondition(condition, alias, column, LE, rightAlias, val);
     }
 
     /* ****************************************** **/
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Compare.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Compare.java
index da0ea14..b995c71 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Compare.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Compare.java
@@ -13,17 +13,13 @@ import java.util.Map;
 @SuppressWarnings("unused")
 public interface Compare<Children> extends Serializable {
 
-    /**
-     * ignore
-     */
-    default  Children allEq(Map<KProperty<?>,?> params) {
+
+    default Children allEq(Map<KProperty<?>, ?> params) {
         return allEq(params, true);
     }
 
-    /**
-     * ignore
-     */
-    default  Children allEq(Map<KProperty<?>, ?> params, boolean null2IsNull) {
+
+    default Children allEq(Map<KProperty<?>, ?> params, boolean null2IsNull) {
         return allEq(true, params, null2IsNull);
     }
 
@@ -35,15 +31,19 @@ public interface Compare<Children> extends Serializable {
      * @param null2IsNull 是否参数为 null 自动执行 isNull 方法, false 则忽略这个字段\
      * @return children
      */
-     Children allEq(boolean condition, Map<KProperty<?>, ?> params, boolean null2IsNull);
+    Children allEq(boolean condition, Map<KProperty<?>, ?> params, boolean null2IsNull);
 
 
-    /**
-     * ignore
-     */
-    @SuppressWarnings("UnusedReturnValue")
-    default  Children eq(KProperty<?> column, Object val) {
-        return eq(true, column, val);
+    default Children eq(KProperty<?> column, Object val) {
+        return eq(true, null, column, val);
+    }
+
+    default Children eq(String alias, KProperty<?> column, Object val) {
+        return eq(true, alias, column, val);
+    }
+
+    default Children eq(boolean condition, KProperty<?> column, Object val) {
+        return eq(condition, null, column, val);
     }
 
     /**
@@ -54,13 +54,19 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-     Children eq(boolean condition, KProperty<?> column, Object val);
+    Children eq(boolean condition, String alias, KProperty<?> column, Object val);
 
-    /**
-     * ignore
-     */
-    default  Children ne(KProperty<?> column, Object val) {
-        return ne(true, column, val);
+
+    default Children ne(KProperty<?> column, Object val) {
+        return ne(true, null, column, val);
+    }
+
+    default Children ne(String alias, KProperty<?> column, Object val) {
+        return ne(true, alias, column, val);
+    }
+
+    default Children ne(boolean condition, KProperty<?> column, Object val) {
+        return ne(condition, null, column, val);
     }
 
     /**
@@ -71,13 +77,19 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-     Children ne(boolean condition, KProperty<?> column, Object val);
+    Children ne(boolean condition, String alias, KProperty<?> column, Object val);
 
-    /**
-     * ignore
-     */
-    default  Children gt(KProperty<?> column, Object val) {
-        return gt(true, column, val);
+
+    default Children gt(KProperty<?> column, Object val) {
+        return gt(true, null, column, val);
+    }
+
+    default Children gt(String alias, KProperty<?> column, Object val) {
+        return gt(true, alias, column, val);
+    }
+
+    default Children gt(boolean condition, KProperty<?> column, Object val) {
+        return gt(condition, null, column, val);
     }
 
     /**
@@ -88,13 +100,19 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-     Children gt(boolean condition, KProperty<?> column, Object val);
+    Children gt(boolean condition, String alias, KProperty<?> column, Object val);
 
-    /**
-     * ignore
-     */
-    default  Children ge(KProperty<?> column, Object val) {
-        return ge(true, column, val);
+
+    default Children ge(KProperty<?> column, Object val) {
+        return ge(true, null, column, val);
+    }
+
+    default Children ge(String alias, KProperty<?> column, Object val) {
+        return ge(true, alias, column, val);
+    }
+
+    default Children ge(boolean condition, KProperty<?> column, Object val) {
+        return ge(condition, null, column, val);
     }
 
     /**
@@ -105,13 +123,19 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-     Children ge(boolean condition, KProperty<?> column, Object val);
+    Children ge(boolean condition, String alias, KProperty<?> column, Object val);
 
-    /**
-     * ignore
-     */
-    default  Children lt(KProperty<?> column, Object val) {
-        return lt(true, column, val);
+
+    default Children lt(KProperty<?> column, Object val) {
+        return lt(true, null, column, val);
+    }
+
+    default Children lt(String alias, KProperty<?> column, Object val) {
+        return lt(true, alias, column, val);
+    }
+
+    default Children lt(boolean condition, KProperty<?> column, Object val) {
+        return lt(condition, null, column, val);
     }
 
     /**
@@ -122,13 +146,19 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-     Children lt(boolean condition, KProperty<?> column, Object val);
+    Children lt(boolean condition, String alias, KProperty<?> column, Object val);
+
 
-    /**
-     * ignore
-     */
     default Children le(KProperty<?> column, Object val) {
-        return le(true, column, val);
+        return le(true, null, column, val);
+    }
+
+    default Children le(String alias, KProperty<?> column, Object val) {
+        return le(true, alias, column, val);
+    }
+
+    default Children le(boolean condition, KProperty<?> column, Object val) {
+        return le(condition, null, column, val);
     }
 
     /**
@@ -139,13 +169,19 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-     Children le(boolean condition, KProperty<?> column, Object val);
+    Children le(boolean condition, String alias, KProperty<?> column, Object val);
 
-    /**
-     * ignore
-     */
-    default  Children between(KProperty<?> column, Object val1, Object val2) {
-        return between(true, column, val1, val2);
+
+    default Children between(KProperty<?> column, Object val1, Object val2) {
+        return between(true, null, column, val1, val2);
+    }
+
+    default Children between(String alias, KProperty<?> column, Object val1, Object val2) {
+        return between(true, alias, column, val1, val2);
+    }
+
+    default Children between(boolean condition, KProperty<?> column, Object val1, Object val2) {
+        return between(condition, null, column, val1, val2);
     }
 
     /**
@@ -157,13 +193,18 @@ public interface Compare<Children> extends Serializable {
      * @param val2      值2
      * @return children
      */
-     Children between(boolean condition, KProperty<?> column, Object val1, Object val2);
+    Children between(boolean condition, String alias, KProperty<?> column, Object val1, Object val2);
 
-    /**
-     * ignore
-     */
-    default  Children notBetween(KProperty<?> column, Object val1, Object val2) {
-        return notBetween(true, column, val1, val2);
+    default Children notBetween(KProperty<?> column, Object val1, Object val2) {
+        return notBetween(true, null, column, val1, val2);
+    }
+
+    default Children notBetween(String alias, KProperty<?> column, Object val1, Object val2) {
+        return notBetween(true, alias, column, val1, val2);
+    }
+
+    default Children notBetween(boolean condition, KProperty<?> column, Object val1, Object val2) {
+        return notBetween(condition, null, column, val1, val2);
     }
 
     /**
@@ -175,13 +216,19 @@ public interface Compare<Children> extends Serializable {
      * @param val2      值2
      * @return children
      */
-     Children notBetween(boolean condition, KProperty<?> column, Object val1, Object val2);
+    Children notBetween(boolean condition, String alias, KProperty<?> column, Object val1, Object val2);
 
-    /**
-     * ignore
-     */
-    default  Children like(KProperty<?> column, Object val) {
-        return like(true, column, val);
+
+    default Children like(KProperty<?> column, Object val) {
+        return like(true, null, column, val);
+    }
+
+    default Children like(String alisa, KProperty<?> column, Object val) {
+        return like(true, alisa, column, val);
+    }
+
+    default Children like(boolean condition, KProperty<?> column, Object val) {
+        return like(condition, null, column, val);
     }
 
     /**
@@ -192,13 +239,19 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-     Children like(boolean condition, KProperty<?> column, Object val);
+    Children like(boolean condition, String alias, KProperty<?> column, Object val);
 
-    /**
-     * ignore
-     */
-    default  Children notLike(KProperty<?> column, Object val) {
-        return notLike(true, column, val);
+
+    default Children notLike(KProperty<?> column, Object val) {
+        return notLike(true, null, column, val);
+    }
+
+    default Children notLike(String alias, KProperty<?> column, Object val) {
+        return notLike(true, alias, column, val);
+    }
+
+    default Children notLike(boolean condition, KProperty<?> column, Object val) {
+        return notLike(condition, null, column, val);
     }
 
     /**
@@ -209,13 +262,19 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-     Children notLike(boolean condition, KProperty<?> column, Object val);
+    Children notLike(boolean condition, String alias, KProperty<?> column, Object val);
 
-    /**
-     * ignore
-     */
-    default  Children likeLeft(KProperty<?> column, Object val) {
-        return likeLeft(true, column, val);
+
+    default Children likeLeft(KProperty<?> column, Object val) {
+        return likeLeft(true, null, column, val);
+    }
+
+    default Children likeLeft(String alias, KProperty<?> column, Object val) {
+        return likeLeft(true, alias, column, val);
+    }
+
+    default Children likeLeft(boolean condition, KProperty<?> column, Object val) {
+        return likeLeft(condition, null, column, val);
     }
 
     /**
@@ -226,15 +285,22 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-     Children likeLeft(boolean condition, KProperty<?> column, Object val);
+    Children likeLeft(boolean condition, String alias, KProperty<?> column, Object val);
 
-    /**
-     * ignore
-     */
-    default  Children likeRight(KProperty<?> column, Object val) {
-        return likeRight(true, column, val);
+
+    default Children likeRight(KProperty<?> column, Object val) {
+        return likeRight(true, null, column, val);
     }
 
+    default Children likeRight(String alias, KProperty<?> column, Object val) {
+        return likeRight(true, alias, column, val);
+    }
+
+    default Children likeRight(boolean condition, KProperty<?> column, Object val) {
+        return likeRight(condition, null, column, val);
+    }
+
+
     /**
      * LIKE '值%'
      *
@@ -243,5 +309,5 @@ public interface Compare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-     Children likeRight(boolean condition, KProperty<?> column, Object val);
+    Children likeRight(boolean condition, String alias, KProperty<?> column, Object val);
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Func.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Func.java
index ff417ff..2b74cf9 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Func.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Func.java
@@ -12,15 +12,20 @@ import java.util.function.Consumer;
  * <p>
  * copy {@link com.baomidou.mybatisplus.core.conditions.interfaces.Func}
  */
-@SuppressWarnings({"unused", "JavadocDeclaration"})
+@SuppressWarnings("unused")
 public interface Func<Children> extends Serializable {
 
-    /**
-     * ignore
-     */
-    @SuppressWarnings("UnusedReturnValue")
+
     default Children isNull(KProperty<?> column) {
-        return isNull(true, column);
+        return isNull(true, null, column);
+    }
+
+    default Children isNull(String alias, KProperty<?> column) {
+        return isNull(true, alias, column);
+    }
+
+    default Children isNull(boolean condition, KProperty<?> column) {
+        return isNull(condition, null, column);
     }
 
     /**
@@ -31,13 +36,19 @@ public interface Func<Children> extends Serializable {
      * @param column    字段
      * @return children
      */
-    Children isNull(boolean condition, KProperty<?> column);
+    Children isNull(boolean condition, String alias, KProperty<?> column);
+
 
-    /**
-     * ignore
-     */
     default Children isNotNull(KProperty<?> column) {
-        return isNotNull(true, column);
+        return isNotNull(true, null, column);
+    }
+
+    default Children isNotNull(String alias, KProperty<?> column) {
+        return isNotNull(true, alias, column);
+    }
+
+    default Children isNotNull(boolean condition, KProperty<?> column) {
+        return isNotNull(condition, null, column);
     }
 
     /**
@@ -48,13 +59,19 @@ public interface Func<Children> extends Serializable {
      * @param column    字段
      * @return children
      */
-    Children isNotNull(boolean condition, KProperty<?> column);
+    Children isNotNull(boolean condition, String alias, KProperty<?> column);
+
 
-    /**
-     * ignore
-     */
     default Children in(KProperty<?> column, Collection<?> coll) {
-        return in(true, column, coll);
+        return in(true, null, column, coll);
+    }
+
+    default Children in(String alias, KProperty<?> column, Collection<?> coll) {
+        return in(true, alias, column, coll);
+    }
+
+    default Children in(boolean condition, KProperty<?> column, Collection<?> coll) {
+        return in(condition, null, column, coll);
     }
 
     /**
@@ -69,13 +86,19 @@ public interface Func<Children> extends Serializable {
      * @param coll      数据集合
      * @return children
      */
-    Children in(boolean condition, KProperty<?> column, Collection<?> coll);
+    Children in(boolean condition, String alias, KProperty<?> column, Collection<?> coll);
+
 
-    /**
-     * ignore
-     */
     default Children in(KProperty<?> column, Object... values) {
-        return in(true, column, values);
+        return in(true, null, column, values);
+    }
+
+    default Children in(String alias, KProperty<?> column, Object... values) {
+        return in(true, alias, column, values);
+    }
+
+    default Children in(boolean condition, KProperty<?> column, Object... values) {
+        return in(condition, null, column, values);
     }
 
     /**
@@ -90,13 +113,19 @@ public interface Func<Children> extends Serializable {
      * @param values    数据数组
      * @return children
      */
-    Children in(boolean condition, KProperty<?> column, Object... values);
+    Children in(boolean condition, String alias, KProperty<?> column, Object... values);
+
 
-    /**
-     * ignore
-     */
     default Children notIn(KProperty<?> column, Collection<?> coll) {
-        return notIn(true, column, coll);
+        return notIn(true, null, column, coll);
+    }
+
+    default Children notIn(String alias, KProperty<?> column, Collection<?> coll) {
+        return notIn(true, alias, column, coll);
+    }
+
+    default Children notIn(boolean condition, KProperty<?> column, Collection<?> coll) {
+        return notIn(condition, null, column, coll);
     }
 
     /**
@@ -108,13 +137,19 @@ public interface Func<Children> extends Serializable {
      * @param coll      数据集合
      * @return children
      */
-    Children notIn(boolean condition, KProperty<?> column, Collection<?> coll);
+    Children notIn(boolean condition, String alias, KProperty<?> column, Collection<?> coll);
+
 
-    /**
-     * ignore
-     */
     default Children notIn(KProperty<?> column, Object... value) {
-        return notIn(true, column, value);
+        return notIn(true, null, column, value);
+    }
+
+    default Children notIn(String alias, KProperty<?> column, Object... value) {
+        return notIn(true, alias, column, value);
+    }
+
+    default Children notIn(boolean condition, KProperty<?> column, Object... values) {
+        return notIn(condition, null, column, values);
     }
 
     /**
@@ -126,13 +161,19 @@ public interface Func<Children> extends Serializable {
      * @param values    数据数组
      * @return children
      */
-    Children notIn(boolean condition, KProperty<?> column, Object... values);
+    Children notIn(boolean condition, String alias, KProperty<?> column, Object... values);
+
 
-    /**
-     * ignore
-     */
     default Children inSql(KProperty<?> column, String inValue) {
-        return inSql(true, column, inValue);
+        return inSql(true, null, column, inValue);
+    }
+
+    default Children inSql(String alias, KProperty<?> column, String inValue) {
+        return inSql(true, alias, column, inValue);
+    }
+
+    default Children inSql(boolean condition, KProperty<?> column, String inValue) {
+        return inSql(condition, null, column, inValue);
     }
 
     /**
@@ -146,13 +187,19 @@ public interface Func<Children> extends Serializable {
      * @param inValue   sql语句
      * @return children
      */
-    Children inSql(boolean condition, KProperty<?> column, String inValue);
+    Children inSql(boolean condition, String alias, KProperty<?> column, String inValue);
+
 
-    /**
-     * ignore
-     */
     default Children notInSql(KProperty<?> column, String inValue) {
-        return notInSql(true, column, inValue);
+        return notInSql(true, null, column, inValue);
+    }
+
+    default Children notInSql(String alias, KProperty<?> column, String inValue) {
+        return notInSql(true, alias, column, inValue);
+    }
+
+    default Children notInSql(boolean condition, KProperty<?> column, String inValue) {
+        return notInSql(condition, null, column, inValue);
     }
 
     /**
@@ -166,26 +213,42 @@ public interface Func<Children> extends Serializable {
      * @param inValue   sql语句 ---&gt; 1,2,3,4,5,6 或者 select id from table where id &lt; 3
      * @return children
      */
-    Children notInSql(boolean condition, KProperty<?> column, String inValue);
+    Children notInSql(boolean condition, String alias, KProperty<?> column, String inValue);
 
+    default Children gtSql(KProperty<?> column, String inValue) {
+        return gtSql(true, null, column, inValue);
+    }
+
+    default Children gtSql(String alias, KProperty<?> column, String inValue) {
+        return gtSql(true, alias, column, inValue);
+    }
+
+    default Children gtSql(boolean condition, KProperty<?> column, String inValue) {
+        return gtSql(condition, null, column, inValue);
+    }
 
     /**
      * 字段 &gt; ( sql语句 )
      * <p>例1: gtSql("id", "1, 2, 3, 4, 5, 6")</p>
      * <p>例1: gtSql("id", "select id from table where name = 'JunJun'")</p>
      *
-     * @param condition
-     * @param column
-     * @param inValue
-     * @return
+     * @param condition 执行条件
+     * @param column    字段
+     * @param inValue   sql语句
+     * @return children
      */
-    Children gtSql(boolean condition, KProperty<?> column, String inValue);
+    Children gtSql(boolean condition, String alias, KProperty<?> column, String inValue);
 
-    /**
-     * ignore
-     */
-    default Children gtSql(KProperty<?> column, String inValue) {
-        return gtSql(true, column, inValue);
+    default Children geSql(KProperty<?> column, String inValue) {
+        return geSql(true, null, column, inValue);
+    }
+
+    default Children geSql(String alias, KProperty<?> column, String inValue) {
+        return geSql(true, alias, column, inValue);
+    }
+
+    default Children geSql(boolean condition, KProperty<?> column, String inValue) {
+        return geSql(condition, null, column, inValue);
     }
 
     /**
@@ -193,18 +256,24 @@ public interface Func<Children> extends Serializable {
      * <p>例1: geSql("id", "1, 2, 3, 4, 5, 6")</p>
      * <p>例1: geSql("id", "select id from table where name = 'JunJun'")</p>
      *
-     * @param condition
-     * @param column
-     * @param inValue
-     * @return
+     * @param condition 执行条件
+     * @param column    字段
+     * @param inValue   sql语句
+     * @return children
      */
-    Children geSql(boolean condition, KProperty<?> column, String inValue);
+    Children geSql(boolean condition, String alias, KProperty<?> column, String inValue);
 
-    /**
-     * ignore
-     */
-    default Children geSql(KProperty<?> column, String inValue) {
-        return geSql(true, column, inValue);
+
+    default Children ltSql(KProperty<?> column, String inValue) {
+        return ltSql(true, null, column, inValue);
+    }
+
+    default Children ltSql(String alias, KProperty<?> column, String inValue) {
+        return ltSql(true, alias, column, inValue);
+    }
+
+    default Children ltSql(boolean condition, KProperty<?> column, String inValue) {
+        return ltSql(condition, null, column, inValue);
     }
 
     /**
@@ -212,18 +281,23 @@ public interface Func<Children> extends Serializable {
      * <p>例1: ltSql("id", "1, 2, 3, 4, 5, 6")</p>
      * <p>例1: ltSql("id", "select id from table where name = 'JunJun'")</p>
      *
-     * @param condition
-     * @param column
-     * @param inValue
-     * @return
+     * @param condition 执行条件
+     * @param column    字段
+     * @param inValue   sql语句
+     * @return children
      */
-    Children ltSql(boolean condition, KProperty<?> column, String inValue);
+    Children ltSql(boolean condition, String alias, KProperty<?> column, String inValue);
 
-    /**
-     * ignore
-     */
-    default Children ltSql(KProperty<?> column, String inValue) {
-        return ltSql(true, column, inValue);
+    default Children leSql(KProperty<?> column, String inValue) {
+        return leSql(true, null, column, inValue);
+    }
+
+    default Children leSql(String alias, KProperty<?> column, String inValue) {
+        return leSql(true, alias, column, inValue);
+    }
+
+    default Children leSql(boolean condition, KProperty<?> column, String inValue) {
+        return leSql(condition, null, column, inValue);
     }
 
     /**
@@ -231,44 +305,40 @@ public interface Func<Children> extends Serializable {
      * <p>例1: leSql("id", "1, 2, 3, 4, 5, 6")</p>
      * <p>例1: leSql("id", "select id from table where name = 'JunJun'")</p>
      *
-     * @param condition
-     * @param column
-     * @param inValue
-     * @return
+     * @param condition 执行条件
+     * @param column    字段
+     * @param inValue   sql语句
+     * @return children
      */
-    Children leSql(boolean condition, KProperty<?> column, String inValue);
+    Children leSql(boolean condition, String alias, KProperty<?> column, String inValue);
 
-    /**
-     * ignore
-     */
-    default Children leSql(KProperty<?> column, String inValue) {
-        return leSql(true, column, inValue);
-    }
 
-    /**
-     * ignore
-     */
-    default Children groupBy(KProperty<?> column) {
-        return groupBy(true, column);
-    }
-
-    /**
-     * ignore
-     */
     default Children groupBy(List<KProperty<?>> column) {
-        return groupBy(true, column);
+        return groupBy(true, null, column);
     }
 
-    /**
-     * ignore
-     */
-    Children groupBy(boolean condition, List<KProperty<?>> columns);
+    default Children groupBy(String alias, List<KProperty<?>> column) {
+        return groupBy(true, alias, column);
+    }
 
-    /**
-     * ignore
-     */
-    default Children groupBy(KProperty<?> column, KProperty<?>... columns) {
-        return groupBy(true, column, columns);
+    default Children groupBy(boolean condition, List<KProperty<?>> columns) {
+        return groupBy(condition, null, columns);
+    }
+
+
+    Children groupBy(boolean condition, String alias, List<KProperty<?>> columns);
+
+
+    default Children groupBy(KProperty<?>... columns) {
+        return groupBy(true, null, columns);
+    }
+
+    default Children groupBy(String alias, KProperty<?>... columns) {
+        return groupBy(true, alias, columns);
+    }
+
+    default Children groupBy(boolean condition, KProperty<?>... columns) {
+        return groupBy(condition, null, columns);
     }
 
     /**
@@ -276,36 +346,42 @@ public interface Func<Children> extends Serializable {
      * <p>例: groupBy("id", "name")</p>
      *
      * @param condition 执行条件
-     * @param column    单个字段
      * @param columns   字段数组
      * @return children
      */
-    Children groupBy(boolean condition, KProperty<?> column, KProperty<?>... columns);
+    Children groupBy(boolean condition, String alias, KProperty<?>... columns);
+
 
-    /**
-     * ignore
-     */
     default Children orderByAsc(KProperty<?> column) {
-        return orderByAsc(true, column);
+        return orderByAsc(true, (String) null, column);
     }
 
-    /**
-     * ignore
-     */
+    default Children orderByAsc(String alias, KProperty<?> column) {
+        return orderByAsc(true, alias, column);
+    }
+
+
     default Children orderByAsc(List<KProperty<?>> columns) {
-        return orderByAsc(true, columns);
+        return orderByAsc(true, null, columns);
     }
 
-    /**
-     * ignore
-     */
-    Children orderByAsc(boolean condition, List<KProperty<?>> columns);
+    default Children orderByAsc(String alias, List<KProperty<?>> columns) {
+        return orderByAsc(true, alias, columns);
+    }
 
-    /**
-     * ignore
-     */
-    default Children orderByAsc(KProperty<?> column, KProperty<?>... columns) {
-        return orderByAsc(true, column, columns);
+    default Children orderByAsc(boolean condition, List<KProperty<?>> columns) {
+        return orderByAsc(condition, null, columns);
+    }
+
+    Children orderByAsc(boolean condition, String alias, List<KProperty<?>> columns);
+
+
+    default Children orderByAsc(KProperty<?>... columns) {
+        return orderByAsc(true, null, columns);
+    }
+
+    default Children orderByAsc(String alias, KProperty<?>... columns) {
+        return orderByAsc(true, alias, columns);
     }
 
     /**
@@ -313,38 +389,38 @@ public interface Func<Children> extends Serializable {
      * <p>例: orderByAsc("id", "name")</p>
      *
      * @param condition 执行条件
-     * @param column    单个字段
      * @param columns   字段数组
      * @return children
      */
-    default Children orderByAsc(boolean condition, KProperty<?> column, KProperty<?>... columns) {
-        return orderBy(condition, true, column, columns);
+    default Children orderByAsc(boolean condition, KProperty<?>... columns) {
+        return orderBy(condition, true, null, columns);
     }
 
-    /**
-     * ignore
-     */
-    default Children orderByDesc(KProperty<?> column) {
-        return orderByDesc(true, column);
+    default Children orderByAsc(boolean condition, String alias, KProperty<?>... columns) {
+        return orderBy(condition, true, alias, columns);
     }
 
-    /**
-     * ignore
-     */
     default Children orderByDesc(List<KProperty<?>> columns) {
-        return orderByDesc(true, columns);
+        return orderByDesc(true, null, columns);
     }
 
-    /**
-     * ignore
-     */
-    Children orderByDesc(boolean condition, List<KProperty<?>> columns);
+    default Children orderByDesc(String alias, List<KProperty<?>> columns) {
+        return orderByDesc(true, alias, columns);
+    }
 
-    /**
-     * ignore
-     */
-    default Children orderByDesc(KProperty<?> column, KProperty<?>... columns) {
-        return orderByDesc(true, column, columns);
+    default Children orderByDesc(boolean condition, List<KProperty<?>> columns) {
+        return orderByDesc(condition, null, columns);
+    }
+
+    Children orderByDesc(boolean condition, String alias, List<KProperty<?>> columns);
+
+
+    default Children orderByDesc(KProperty<?>... columns) {
+        return orderByDesc(true, null, columns);
+    }
+
+    default Children orderByDesc(String alias, KProperty<?>... columns) {
+        return orderByDesc(true, alias, columns);
     }
 
     /**
@@ -352,12 +428,19 @@ public interface Func<Children> extends Serializable {
      * <p>例: orderByDesc("id", "name")</p>
      *
      * @param condition 执行条件
-     * @param column    单个字段
      * @param columns   字段数组
      * @return children
      */
-    default Children orderByDesc(boolean condition, KProperty<?> column, KProperty<?>... columns) {
-        return orderBy(condition, false, column, columns);
+    default Children orderByDesc(boolean condition, KProperty<?>... columns) {
+        return orderBy(condition, false, null, columns);
+    }
+
+    default Children orderByDesc(boolean condition, String alias, KProperty<?>... columns) {
+        return orderBy(condition, false, alias, columns);
+    }
+
+    default Children orderBy(boolean condition, boolean isAsc, KProperty<?>... columns) {
+        return orderBy(condition, isAsc, null, columns);
     }
 
     /**
@@ -366,15 +449,12 @@ public interface Func<Children> extends Serializable {
      *
      * @param condition 执行条件
      * @param isAsc     是否是 ASC 排序
-     * @param column    单个字段
      * @param columns   字段数组
      * @return children
      */
-    Children orderBy(boolean condition, boolean isAsc, KProperty<?> column, KProperty<?>... columns);
+    Children orderBy(boolean condition, boolean isAsc, String alias, KProperty<?>... columns);
+
 
-    /**
-     * ignore
-     */
     default Children having(String sqlHaving, Object... params) {
         return having(true, sqlHaving, params);
     }
@@ -391,9 +471,7 @@ public interface Func<Children> extends Serializable {
      */
     Children having(boolean condition, String sqlHaving, Object... params);
 
-    /**
-     * ignore
-     */
+
     default Children func(Consumer<Children> consumer) {
         return func(true, consumer);
     }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/OnCompare.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/OnCompare.java
index f26dbef..430eaa8 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/OnCompare.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/OnCompare.java
@@ -14,11 +14,33 @@ import java.io.Serializable;
  */
 @SuppressWarnings("unused")
 public interface OnCompare<Children> extends Serializable {
-    /**
-     * ignore
-     */
+
     default Children eq(KProperty<?> column, KProperty<?> val) {
-        return eq(true, column, val);
+        return eq(true, null, column, null, val);
+    }
+
+    default Children eq(String alias, KProperty<?> column, KProperty<?> val) {
+        return eq(true, alias, column, null, val);
+    }
+
+    default Children eq(KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return eq(true, null, column, rightAlias, val);
+    }
+
+    default Children eq(String alias, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return eq(true, alias, column, rightAlias, val);
+    }
+
+    default Children eq(boolean condition, KProperty<?> column, KProperty<?> val) {
+        return eq(condition, null, column, null, val);
+    }
+
+    default Children eq(boolean condition, String alias, KProperty<?> column, KProperty<?> val) {
+        return eq(condition, alias, column, null, val);
+    }
+
+    default Children eq(boolean condition, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return eq(condition, null, column, rightAlias, val);
     }
 
     /**
@@ -29,13 +51,35 @@ public interface OnCompare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    Children eq(boolean condition, KProperty<?> column, KProperty<?> val);
+    Children eq(boolean condition, String alias, KProperty<?> column, String rightAlias, KProperty<?> val);
+
 
-    /**
-     * ignore
-     */
     default Children ne(KProperty<?> column, KProperty<?> val) {
-        return ne(true, column, val);
+        return ne(true, null, column, null, val);
+    }
+
+    default Children ne(String alias, KProperty<?> column, KProperty<?> val) {
+        return ne(true, alias, column, null, val);
+    }
+
+    default Children ne(KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return ne(true, null, column, rightAlias, val);
+    }
+
+    default Children ne(String alias, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return ne(true, alias, column, rightAlias, val);
+    }
+
+    default Children ne(boolean condition, KProperty<?> column, KProperty<?> val) {
+        return ne(condition, null, column, null, val);
+    }
+
+    default Children ne(boolean condition, String alias, KProperty<?> column, KProperty<?> val) {
+        return ne(condition, alias, column, null, val);
+    }
+
+    default Children ne(boolean condition, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return ne(condition, null, column, rightAlias, val);
     }
 
     /**
@@ -46,13 +90,35 @@ public interface OnCompare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    Children ne(boolean condition, KProperty<?> column, KProperty<?> val);
+    Children ne(boolean condition, String alias, KProperty<?> column, String rightAlias, KProperty<?> val);
+
 
-    /**
-     * ignore
-     */
     default Children gt(KProperty<?> column, KProperty<?> val) {
-        return gt(true, column, val);
+        return gt(true, null, column, null, val);
+    }
+
+    default Children gt(String alias, KProperty<?> column, KProperty<?> val) {
+        return gt(true, alias, column, null, val);
+    }
+
+    default Children gt(KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return gt(true, null, column, rightAlias, val);
+    }
+
+    default Children gt(String alias, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return gt(true, alias, column, rightAlias, val);
+    }
+
+    default Children gt(boolean condition, KProperty<?> column, KProperty<?> val) {
+        return gt(condition, null, column, null, val);
+    }
+
+    default Children gt(boolean condition, String alias, KProperty<?> column, KProperty<?> val) {
+        return gt(condition, alias, column, null, val);
+    }
+
+    default Children gt(boolean condition, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return gt(condition, null, column, rightAlias, val);
     }
 
     /**
@@ -63,13 +129,35 @@ public interface OnCompare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    Children gt(boolean condition, KProperty<?> column, KProperty<?> val);
+    Children gt(boolean condition, String alias, KProperty<?> column, String rightAlias, KProperty<?> val);
+
 
-    /**
-     * ignore
-     */
     default Children ge(KProperty<?> column, KProperty<?> val) {
-        return ge(true, column, val);
+        return ge(true, null, column, null, val);
+    }
+
+    default Children ge(String alias, KProperty<?> column, KProperty<?> val) {
+        return ge(true, alias, column, null, val);
+    }
+
+    default Children ge(KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return ge(true, null, column, rightAlias, val);
+    }
+
+    default Children ge(String alias, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return ge(true, alias, column, rightAlias, val);
+    }
+
+    default Children ge(boolean condition, KProperty<?> column, KProperty<?> val) {
+        return ge(condition, null, column, null, val);
+    }
+
+    default Children ge(boolean condition, String alias, KProperty<?> column, KProperty<?> val) {
+        return ge(condition, alias, column, null, val);
+    }
+
+    default Children ge(boolean condition, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return ge(condition, null, column, rightAlias, val);
     }
 
     /**
@@ -80,13 +168,35 @@ public interface OnCompare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    Children ge(boolean condition, KProperty<?> column, KProperty<?> val);
+    Children ge(boolean condition, String alias, KProperty<?> column, String rightAlias, KProperty<?> val);
+
 
-    /**
-     * ignore
-     */
     default Children lt(KProperty<?> column, KProperty<?> val) {
-        return lt(true, column, val);
+        return lt(true, null, column, null, val);
+    }
+
+    default Children lt(String alias, KProperty<?> column, KProperty<?> val) {
+        return lt(true, alias, column, null, val);
+    }
+
+    default Children lt(KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return lt(true, null, column, rightAlias, val);
+    }
+
+    default Children lt(String alias, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return lt(true, alias, column, rightAlias, val);
+    }
+
+    default Children lt(boolean condition, KProperty<?> column, KProperty<?> val) {
+        return lt(condition, null, column, null, val);
+    }
+
+    default Children lt(boolean condition, String alias, KProperty<?> column, KProperty<?> val) {
+        return lt(condition, alias, column, null, val);
+    }
+
+    default Children lt(boolean condition, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return lt(condition, null, column, rightAlias, val);
     }
 
     /**
@@ -97,13 +207,35 @@ public interface OnCompare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    Children lt(boolean condition, KProperty<?> column, KProperty<?> val);
+    Children lt(boolean condition, String alias, KProperty<?> column, String rightAlias, KProperty<?> val);
+
 
-    /**
-     * ignore
-     */
     default Children le(KProperty<?> column, KProperty<?> val) {
-        return le(true, column, val);
+        return le(true, null, column, null, val);
+    }
+
+    default Children le(String alias, KProperty<?> column, KProperty<?> val) {
+        return le(true, alias, column, null, val);
+    }
+
+    default Children le(KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return le(true, null, column, rightAlias, val);
+    }
+
+    default Children le(String alias, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return le(true, alias, column, rightAlias, val);
+    }
+
+    default Children le(boolean condition, KProperty<?> column, KProperty<?> val) {
+        return le(condition, null, column, null, val);
+    }
+
+    default Children le(boolean condition, String alias, KProperty<?> column, KProperty<?> val) {
+        return le(condition, alias, column, null, val);
+    }
+
+    default Children le(boolean condition, KProperty<?> column, String rightAlias, KProperty<?> val) {
+        return le(condition, null, column, rightAlias, val);
     }
 
     /**
@@ -114,5 +246,5 @@ public interface OnCompare<Children> extends Serializable {
      * @param val       值
      * @return children
      */
-    Children le(boolean condition, KProperty<?> column, KProperty<?> val);
+    Children le(boolean condition, String alias, KProperty<?> column, String rightAlias, KProperty<?> val);
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryJoin.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryJoin.java
index d580e69..2767851 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryJoin.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryJoin.java
@@ -26,6 +26,17 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(Constant.LEFT_JOIN, clazz, left, right);
     }
 
+    /**
+     * left join
+     *
+     * @param clazz 关联的实体类
+     * @param left  条件
+     * @param right 条件
+     */
+    default Children leftJoin(Class<?> clazz, KProperty<?> left, String rightAlias, KProperty<?> right) {
+        return join(Constant.LEFT_JOIN, clazz, left, rightAlias, right);
+    }
+
     /**
      * left join 多条件
      * <p>
@@ -72,6 +83,17 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(Constant.LEFT_JOIN, clazz, alias, left, right);
     }
 
+    /**
+     * left join
+     *
+     * @param clazz 关联的实体类
+     * @param left  条件
+     * @param right 条件
+     */
+    default Children leftJoin(Class<?> clazz, String alias, KProperty<?> left, String rightAlias, KProperty<?> right) {
+        return join(Constant.LEFT_JOIN, clazz, alias, left, rightAlias, right);
+    }
+
     /**
      * left join 多条件
      * <p>
@@ -114,6 +136,13 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(Constant.RIGHT_JOIN, clazz, left, right);
     }
 
+    /**
+     * ignore 参考 left join
+     */
+    default Children rightJoin(Class<?> clazz, KProperty<?> left, String rightAlias, KProperty<?> right) {
+        return join(Constant.RIGHT_JOIN, clazz, left, rightAlias, right);
+    }
+
     /**
      * ignore 参考 left join
      */
@@ -142,6 +171,13 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(Constant.RIGHT_JOIN, clazz, alias, left, right);
     }
 
+    /**
+     * ignore 参考 left join
+     */
+    default Children rightJoin(Class<?> clazz, String alias, KProperty<?> left, String rightAlias, KProperty<?> right) {
+        return join(Constant.RIGHT_JOIN, clazz, alias, left, rightAlias, right);
+    }
+
     /**
      * ignore 参考 left join
      */
@@ -171,6 +207,14 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(Constant.INNER_JOIN, clazz, on -> on.eq(left, right));
     }
 
+    /**
+     * ignore 参考 left join
+     */
+    default Children innerJoin(Class<?> clazz, KProperty<?> left, String rightAlias, KProperty<?> right) {
+        return join(Constant.INNER_JOIN, clazz, left, rightAlias, right);
+    }
+
+
     /**
      * ignore 参考 left join
      */
@@ -200,6 +244,13 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(Constant.INNER_JOIN, clazz, alias, on -> on.eq(left, right));
     }
 
+    /**
+     * ignore 参考 left join
+     */
+    default Children innerJoin(Class<?> clazz, String alias, KProperty<?> left, String rightAlias, KProperty<?> right) {
+        return join(Constant.INNER_JOIN, clazz, alias, left, rightAlias, right);
+    }
+
     /**
      * ignore 参考 left join
      */
@@ -228,6 +279,13 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(Constant.FULL_JOIN, clazz, left, right);
     }
 
+    /**
+     * ignore 参考 left join
+     */
+    default Children fullJoin(Class<?> clazz, KProperty<?> left, String rightAlias, KProperty<?> right) {
+        return join(Constant.FULL_JOIN, clazz, left, rightAlias, right);
+    }
+
     /**
      * ignore 参考 left join
      */
@@ -256,6 +314,13 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(Constant.FULL_JOIN, clazz, alias, left, right);
     }
 
+    /**
+     * ignore 参考 left join
+     */
+    default Children fullJoin(Class<?> clazz, String alias, KProperty<?> left, String rightAlias, KProperty<?> right) {
+        return join(Constant.FULL_JOIN, clazz, alias, left, rightAlias, right);
+    }
+
     /**
      * ignore 参考 left join
      */
@@ -292,6 +357,13 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(keyWord, clazz, on -> on.eq(left, right));
     }
 
+    /**
+     * ignore
+     */
+    default Children join(String keyWord, Class<?> clazz, KProperty<?> left, String rightAlias, KProperty<?> right) {
+        return join(keyWord, clazz, on -> on.eq(left, rightAlias, right));
+    }
+
     /**
      * 自定义连表关键词
      * <p>
@@ -333,6 +405,13 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
         return join(keyWord, clazz, alias, on -> on.eq(left, right));
     }
 
+    /**
+     * ignore
+     */
+    default <T, X> Children join(String keyWord, Class<?> clazz, String alias, KProperty<?> left, String rightAlias, KProperty<?> right) {
+        return join(keyWord, clazz, alias, on -> on.eq(left, rightAlias, right));
+    }
+
     /**
      * 自定义连表关键词
      * <p>
diff --git a/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MPConfig.java b/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MPConfig.java
deleted file mode 100644
index 075f156..0000000
--- a/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MPConfig.java
+++ /dev/null
@@ -1,150 +0,0 @@
-//package com.github.yulichang.test.config;
-//
-//import com.baomidou.mybatisplus.core.injector.AbstractMethod;
-//import com.baomidou.mybatisplus.core.injector.ISqlInjector;
-//import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-//import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-//import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn;
-//import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-//import com.github.yulichang.injector.MPJSqlInjector;
-//import com.github.yulichang.test.util.ThreadLocalUtils;
-//import org.apache.ibatis.cache.CacheKey;
-//import org.apache.ibatis.executor.Executor;
-//import org.apache.ibatis.executor.statement.StatementHandler;
-//import org.apache.ibatis.mapping.BoundSql;
-//import org.apache.ibatis.mapping.MappedStatement;
-//import org.apache.ibatis.plugin.*;
-//import org.apache.ibatis.session.ResultHandler;
-//import org.apache.ibatis.session.RowBounds;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.context.annotation.Primary;
-//import org.springframework.core.Ordered;
-//import org.springframework.core.annotation.Order;
-//import org.springframework.stereotype.Component;
-//
-//import java.sql.Connection;
-//import java.util.List;
-//import java.util.Objects;
-//import java.util.StringTokenizer;
-//
-///**
-// * mp 3.3.x
-// */
-//@Configuration
-//public class MPConfig {
-//
-//    @Bean
-//    public PaginationInterceptor mybatisPlusInterceptor() {
-//        return new PaginationInterceptor();
-//    }
-//
-//    @Bean
-//    @Primary
-//    @Order(Ordered.HIGHEST_PRECEDENCE)
-//    public ISqlInjector sqlInjector() {
-//        return new MPJSqlInjector() {
-//            @Override
-//            public List<AbstractMethod> getMethodList(Class<?> mapperClass) {
-//                List<AbstractMethod> list = super.getMethodList(mapperClass);
-//                //添加你的方法
-//                list.add(new InsertBatchSomeColumn());
-//                return list;
-//            }
-//        };
-//    }
-//
-//    @Component
-//    @Intercepts({
-//            @Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class}),
-//            @Signature(type = StatementHandler.class, method = "getBoundSql", args = {}),
-//            @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class}),
-//            @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class}),
-//            @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class, CacheKey.class, BoundSql.class}),
-//    })
-//    public static class SqlInterceptor implements Interceptor {
-//
-//        @Override
-//        public Object intercept(Invocation invocation) throws Throwable {
-//            Object target = invocation.getTarget();
-//            BoundSql boundSql = null;
-//            if (target instanceof StatementHandler) {
-//                boundSql = ((StatementHandler) target).getBoundSql();
-//                String sql = boundSql.getSql();
-//                List<String> strings = ThreadLocalUtils.get();
-//                if (CollectionUtils.isNotEmpty(strings)) {
-//                    boolean flag = false;
-//                    String ss = null;
-//                    for (String s : strings) {
-//                        if (sql != null && s != null) {
-//                            String s1 = formatSql(sql);
-//                            String s2 = formatSql(s);
-//                            if (StringUtils.isNotBlank(s)) {
-//                                if (!Objects.equals(s1.toLowerCase(), s2.toLowerCase())) {
-//                                    ss = s;
-//                                } else {
-//                                    flag = true;
-//                                    break;
-//
-//                                }
-//                            }
-//                        }
-//                    }
-//                    if (flag) {
-//                        System.out.println("===============================================");
-//                        System.out.println();
-//                        System.out.println("pass");
-//                        System.out.println();
-//                        System.out.println("===============================================");
-//                    } else {
-//                        System.err.println("执行sql: " + removeExtraWhitespaces(sql));
-//                        System.err.println("预期sql: " + removeExtraWhitespaces(ss));
-//                        throw new RuntimeException("sql error");
-//                    }
-//                }
-//            }
-//            System.out.println(boundSql);
-//            return invocation.proceed();
-//        }
-//
-//        @Override
-//        public Object plugin(Object target) {
-//            if (target instanceof Executor || target instanceof StatementHandler) {
-//                return Plugin.wrap(target, this);
-//            }
-//            return target;
-//        }
-//
-//        private String formatSql(String sql) {
-//            if (StringUtils.isBlank(sql)) {
-//                return sql;
-//            }
-//            sql = sql.replaceAll("\n", "");
-//            sql = sql.replaceAll("\r", "");
-//            sql = sql.replaceAll("\t", "");
-//            return dg(sql);
-//        }
-//
-//        private String dg(String str) {
-//            if (str.contains(" ")) {
-//                str = str.replaceAll(" ", "");
-//                return dg(str);
-//            }
-//            return str;
-//        }
-//
-//        private String removeExtraWhitespaces(String original) {
-//            StringTokenizer tokenizer = new StringTokenizer(original);
-//            StringBuilder builder = new StringBuilder();
-//            boolean hasMoreTokens = tokenizer.hasMoreTokens();
-//            while (hasMoreTokens) {
-//                builder.append(tokenizer.nextToken());
-//                hasMoreTokens = tokenizer.hasMoreTokens();
-//                if (hasMoreTokens) {
-//                    builder.append(' ');
-//                }
-//            }
-//            return builder.toString();
-//        }
-//    }
-//}
diff --git a/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java b/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java
index 2d9c743..f2a9b23 100644
--- a/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java
+++ b/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java
@@ -97,6 +97,10 @@ public class MybatisPlusConfig {
         @SneakyThrows
         public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) {
             String sql = boundSql.getSql();
+            check(sql);
+        }
+
+        private void check(String sql) {
             List<String> sqlList = ThreadLocalUtils.get();
             if (CollectionUtils.isNotEmpty(sqlList)) {
                 if (sqlList.stream().anyMatch(e -> Objects.equals(formatSql(sql), formatSql(e)))) {
@@ -122,20 +126,7 @@ public class MybatisPlusConfig {
                 if (sql.toUpperCase().startsWith("SELECT")) {
                     return;
                 }
-                List<String> sqlList = ThreadLocalUtils.get();
-                if (CollectionUtils.isNotEmpty(sqlList)) {
-                    if (sqlList.stream().anyMatch(e -> Objects.equals(formatSql(sql), formatSql(e)))) {
-                        System.out.println("===============================================");
-                        System.out.println();
-                        System.out.println("pass");
-                        System.out.println();
-                        System.out.println("===============================================");
-                    } else {
-                        System.err.println("执行sql: " + SqlSourceBuilder.removeExtraWhitespaces(sql));
-                        sqlList.forEach(i -> System.err.println("预期sql: " + SqlSourceBuilder.removeExtraWhitespaces(i)));
-                        throw new RuntimeException("sql error");
-                    }
-                }
+                check(sql);
             }
         }
 
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt
index e0f0b9c..78c94a8 100644
--- a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt
+++ b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt
@@ -25,8 +25,9 @@ class CustomWrapperTest {
 
     //自定义wrapper扩展
     class CWrapper<T> : KtLambdaWrapper<T>() {
+
         fun eqIfAbsent(column: KProperty<*>, `val`: Any?): CWrapper<T> {
-            super.eq(Objects.nonNull(`val`), column, `val`)
+            eq(Objects.nonNull(`val`), column, `val`)
             return this
         }
 
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/OrderByTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/OrderByTest.kt
new file mode 100644
index 0000000..9e22b85
--- /dev/null
+++ b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/OrderByTest.kt
@@ -0,0 +1,49 @@
+package com.github.yulichang.test.kt.m
+
+import com.github.yulichang.kt.KtLambdaWrapper
+import com.github.yulichang.test.kt.entity.UserDO
+import com.github.yulichang.test.util.ThreadLocalUtils
+import com.github.yulichang.toolkit.KtWrappers
+import org.junit.jupiter.api.BeforeEach
+import org.springframework.boot.test.context.SpringBootTest
+import kotlin.reflect.KMutableProperty1
+
+@SpringBootTest
+class OrderByTest {
+    @BeforeEach
+    fun setUp() {
+        com.github.yulichang.test.util.Reset.reset()
+    }
+
+    @org.junit.jupiter.api.Test
+    fun orderBy() {
+        ThreadLocalUtils.set(
+            "SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by " +
+                    "FROM `user` t WHERE t.del = false AND (t.id = ?) ORDER BY t.id ASC, t.`name` ASC, t.pid ASC"
+        )
+        val columList: List<KMutableProperty1<UserDO, *>> =
+            listOf<KMutableProperty1<UserDO, *>>(UserDO::id, UserDO::name, UserDO::pid)
+        val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
+            .selectAll(UserDO::class.java)
+            .eq(UserDO::id, 1)
+            .orderByAsc(columList)
+        val list: List<UserDO> = wrapper.list()
+        list.forEach(System.out::println)
+    }
+
+    @org.junit.jupiter.api.Test
+    fun orderBy1() {
+        ThreadLocalUtils.set(
+            "SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by " +
+                    "FROM `user` t WHERE t.del = false AND (t.id = ?) GROUP BY t.id, t.`name`, t.pid"
+        )
+        val columList: List<KMutableProperty1<UserDO, *>> =
+            listOf<KMutableProperty1<UserDO, *>>(UserDO::id, UserDO::name, UserDO::pid)
+        val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
+            .selectAll(UserDO::class.java)
+            .eq(UserDO::id, 1)
+            .groupBy(columList)
+        val list: List<UserDO> = wrapper.list()
+        list.forEach(System.out::println)
+    }
+}
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/TableAliasTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/TableAliasTest.kt
new file mode 100644
index 0000000..e6a4d1a
--- /dev/null
+++ b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/TableAliasTest.kt
@@ -0,0 +1,88 @@
+package com.github.yulichang.test.kt.m
+
+import com.github.yulichang.kt.KtLambdaWrapper
+import com.github.yulichang.test.kt.entity.AddressDO
+import com.github.yulichang.test.kt.entity.AreaDO
+import com.github.yulichang.test.kt.entity.UserDO
+import com.github.yulichang.test.kt.mapper.UserMapper
+import com.github.yulichang.test.util.Reset
+import com.github.yulichang.test.util.ThreadLocalUtils
+import com.github.yulichang.toolkit.KtWrappers
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+
+@SpringBootTest
+class TableAliasTest {
+
+    @Autowired
+    private val userMapper: UserMapper? = null
+
+    @BeforeEach
+    fun setUp() {
+        Reset.reset()
+    }
+
+    @Test
+    fun tableAlias() {
+        ThreadLocalUtils.set(
+            "SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
+                    "LEFT JOIN address addr1 ON (addr1.id = t.address_id) " +
+                    "LEFT JOIN address addr2 ON (addr2.id = t.address_id2) " +
+                    "LEFT JOIN area area1 ON (area1.id = addr1.area_id) " +
+                    "WHERE t.del = false AND addr1.del = false AND addr2.del = false AND area1.del = false " +
+                    "GROUP BY t.id"
+        )
+        val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
+            .selectAll(UserDO::class.java)
+            .leftJoin(AddressDO::class.java, "addr1", AddressDO::id, UserDO::addressId)
+            .leftJoin(AddressDO::class.java, "addr2", AddressDO::id, UserDO::addressId2)
+            .leftJoin(AreaDO::class.java, "area1", AreaDO::id, "addr1", AddressDO::areaId)
+            .groupBy(UserDO::id)
+        val dos: List<UserDO> = userMapper!!.selectJoinList(UserDO::class.java, wrapper)
+        dos.forEach(System.out::println)
+    }
+
+    @Test
+    fun tableAlias2() {
+        ThreadLocalUtils.set(
+            "SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
+                    "LEFT JOIN address addr1 ON (addr1.id = t.address_id) " +
+                    "LEFT JOIN address addr2 ON (addr2.id = t.address_id2) " +
+                    "LEFT JOIN area area1 ON (area1.id = addr2.area_id) " +
+                    "WHERE t.del = false AND addr1.del = false AND addr2.del = false AND area1.del = false " +
+                    "GROUP BY t.id ORDER BY addr1.id DESC"
+        )
+        val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
+            .selectAll(UserDO::class.java)
+            .leftJoin(AddressDO::class.java, "addr1", AddressDO::id, UserDO::addressId)
+            .leftJoin(AddressDO::class.java, "addr2", AddressDO::id, UserDO::addressId2)
+            .leftJoin(AreaDO::class.java, "area1", AreaDO::id, "addr2", AddressDO::areaId)
+            .groupBy(UserDO::id)
+            .orderByDesc("addr1", AddressDO::id)
+        val dos: List<UserDO> = userMapper!!.selectJoinList(UserDO::class.java, wrapper)
+        dos.forEach(System.out::println)
+    }
+
+    @Test
+    fun tableAliasEQ() {
+        ThreadLocalUtils.set(
+            "SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
+                    "LEFT JOIN address addr1 ON (addr1.id = t.address_id) " +
+                    "LEFT JOIN address addr2 ON (addr2.id = t.address_id2) " +
+                    "LEFT JOIN area area1 ON (area1.id = addr2.area_id) WHERE t.del = false AND addr1.del = false AND addr2.del = false AND area1.del = false " +
+                    "AND (addr1.id = ? AND addr2.id = ? AND addr1.id = ?)"
+        )
+        val wrapper: KtLambdaWrapper<UserDO> = KtWrappers.query(UserDO::class.java)
+            .selectAll(UserDO::class.java)
+            .leftJoin(AddressDO::class.java, "addr1", AddressDO::id, UserDO::addressId)
+            .leftJoin(AddressDO::class.java, "addr2", AddressDO::id, UserDO::addressId2)
+            .leftJoin(AreaDO::class.java, "area1", AreaDO::id, "addr2", AddressDO::areaId)
+            .eq("addr1", AddressDO::id, 1)
+            .eq("addr2", AddressDO::id, 2)
+            .eq("addr1", AddressDO::id, 3)
+        val dos: List<UserDO> = userMapper!!.selectJoinList(UserDO::class.java, wrapper)
+        dos.forEach(System.out::println)
+    }
+}

From 2b42b33f419e8b3be311c8680ac33f496edb6415 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 11 Dec 2023 04:06:13 +0800
Subject: [PATCH 33/88] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/autoconfigure/MybatisPlusJoinProperties.java      | 2 +-
 .../META-INF/additional-spring-configuration-metadata.json      | 2 +-
 .../main/java/com/github/yulichang/config/ConfigProperties.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java
index fdba2d8..637f000 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java
@@ -43,7 +43,7 @@ public class MybatisPlusJoinProperties {
     /**
      * 逻辑删除类型 支持 where on
      */
-    private String logicDelType = "where";
+    private String logicDelType = "on";
 
     /**
      * 映射查询最大深度
diff --git a/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 936e2fa..e0d1738 100644
--- a/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -40,7 +40,7 @@
     },
     {
       "name": "mybatis-plus-join.logic-del-type",
-      "defaultValue": "where",
+      "defaultValue": "on",
       "type": "java.lang.String",
       "description": "逻辑删除的位置支持where和on两个."
     },
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
index fa2350a..7151dd8 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
@@ -29,7 +29,7 @@ public class ConfigProperties {
     /**
      * 逻辑删除类型 支持 where on
      */
-    public static LogicDelTypeEnum logicDelType = LogicDelTypeEnum.WHERE;
+    public static LogicDelTypeEnum logicDelType = LogicDelTypeEnum.ON;
     /**
      * 逻辑删除类型 支持 where on
      */

From 69f673f531afc4d10d35d6b86b835aa959f84b60 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 11 Dec 2023 04:09:02 +0800
Subject: [PATCH 34/88] 1.4.8

---
 README-zh.md                   | 4 ++--
 README.md                      | 4 ++--
 mybatis-plus-join-test/pom.xml | 6 +++---
 mybatis-plus-join/pom.xml      | 2 +-
 pom.xml                        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index 1d225fb..201a4c3 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -49,12 +49,12 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.7.2</version>
+      <version>1.4.8</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.7.2'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.8'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/README.md b/README.md
index e49dc07..dd0dafa 100644
--- a/README.md
+++ b/README.md
@@ -47,12 +47,12 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.7.2</version>
+      <version>1.4.8</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.7.2'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.8'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index f46b7e0..3a3fe4f 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -24,8 +24,8 @@
         <module>test-mapping</module>
 
         <!-- 以下两个模块需要jdk17+, 使用jdk8会出现编译错误, 如果有安装jdk17+可以打开这两个模块 -->
-        <module>test-kotlin</module>
-<!--        <module>test-springboot3-jdk17</module>-->
+<!--        <module>test-kotlin</module>-->
+        <!--        <module>test-springboot3-jdk17</module>-->
     </modules>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -50,7 +50,7 @@
     </scm>
 
     <properties>
-        <revision>1.4.7.2</revision>
+        <revision>1.4.8</revision>
         <mpj.mybatis.plus.version>3.5.4.1</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>
diff --git a/mybatis-plus-join/pom.xml b/mybatis-plus-join/pom.xml
index 6b3d6ea..79a65f2 100644
--- a/mybatis-plus-join/pom.xml
+++ b/mybatis-plus-join/pom.xml
@@ -41,7 +41,7 @@
     </scm>
 
     <properties>
-        <revision>1.4.7.2</revision>
+        <revision>1.4.8</revision>
 
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>
diff --git a/pom.xml b/pom.xml
index a737b3a..2677a96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
     </modules>
 
     <properties>
-        <revision>1.4.7.2</revision>
+        <revision>1.4.8</revision>
         <mpj.mybatis.plus.version>3.5.4.1</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>

From b8fbc6fc04b6f25876be0410d2662db113d49dab Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Tue, 12 Dec 2023 19:39:00 +0800
Subject: [PATCH 35/88] fix
 https://gitee.com/best_handsome/mybatis-plus-join/issues/I8NTF1

---
 .../java/com/github/yulichang/toolkit/FieldStringMap.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java
index 2d1196a..054ec0e 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/FieldStringMap.java
@@ -12,11 +12,11 @@ public class FieldStringMap<V> extends HashMap<String, V> {
 
     @Override
     public V get(Object key) {
-        return super.get(((String) key).toUpperCase(Locale.ENGLISH));
+        return super.get(key == null ? null : ((String) key).toUpperCase(Locale.ENGLISH));
     }
 
     @Override
     public boolean containsKey(Object key) {
-        return super.containsKey(((String) key).toUpperCase(Locale.ENGLISH));
+        return super.containsKey(key == null ? null : ((String) key).toUpperCase(Locale.ENGLISH));
     }
 }
\ No newline at end of file

From d8fa7ddf302fcb9ae24d9aa6437a4213e453c68a Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Tue, 12 Dec 2023 19:44:30 +0800
Subject: [PATCH 36/88] 1.4.8.1

---
 README-zh.md                                                  | 4 ++--
 README.md                                                     | 4 ++--
 .../com/github/yulichang/config/MPJInterceptorConfig.java     | 2 +-
 mybatis-plus-join-test/pom.xml                                | 2 +-
 mybatis-plus-join/pom.xml                                     | 2 +-
 pom.xml                                                       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index 201a4c3..88e80fe 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -49,12 +49,12 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.8</version>
+      <version>1.4.8.1</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.8'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.8.1'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/README.md b/README.md
index dd0dafa..d44ae08 100644
--- a/README.md
+++ b/README.md
@@ -47,12 +47,12 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.8</version>
+      <version>1.4.8.1</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.8'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.8.1'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
index 22a510a..b47a29d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
@@ -30,7 +30,7 @@ public class MPJInterceptorConfig {
             System.out.println(" _ _   |_  _ _|_. ___ _ |    _  .  _  .  _  \n" +
                     "| | |\\/|_)(_| | |_\\  |_)||_|_\\  | (_) | | | \n" +
                     "     /               |          /\n" +
-                    "                                    1.4.8");
+                    "                                    1.4.8.1");
         }
     }
 
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index 3a3fe4f..251c30b 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -50,7 +50,7 @@
     </scm>
 
     <properties>
-        <revision>1.4.8</revision>
+        <revision>1.4.8.1</revision>
         <mpj.mybatis.plus.version>3.5.4.1</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>
diff --git a/mybatis-plus-join/pom.xml b/mybatis-plus-join/pom.xml
index 79a65f2..6bcab65 100644
--- a/mybatis-plus-join/pom.xml
+++ b/mybatis-plus-join/pom.xml
@@ -41,7 +41,7 @@
     </scm>
 
     <properties>
-        <revision>1.4.8</revision>
+        <revision>1.4.8.1</revision>
 
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>
diff --git a/pom.xml b/pom.xml
index 2677a96..b7d4d51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
     </modules>
 
     <properties>
-        <revision>1.4.8</revision>
+        <revision>1.4.8.1</revision>
         <mpj.mybatis.plus.version>3.5.4.1</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>

From 72f155319f0cc53439d41bfe80a0acc70229116e Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 18 Dec 2023 23:57:52 +0800
Subject: [PATCH 37/88] =?UTF-8?q?=E4=BC=98=E5=8C=96=20mapper=20not=20find?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MybatisPlusJoinAutoConfiguration.java     | 48 ++++++++++++-------
 .../yulichang/config/ConfigProperties.java    |  4 ++
 .../yulichang/toolkit/SpringContentUtils.java | 17 ++++++-
 .../github/yulichang/toolkit/TableHelper.java | 12 +++++
 .../extension/mapping/config/DeepConfig.java  |  5 +-
 .../mapping/config/MappingConfig.java         |  7 ++-
 .../mapping/mapper/MPJTableFieldInfo.java     |  3 +-
 .../mapping/mapper/MPJTableInfoHelper.java    | 35 +++++++-------
 .../yulichang/test/join/Application.java      |  6 +--
 .../yulichang/test/mapping/Application.java   |  4 ++
 .../yulichang/test/mapping/entity/UserDO.java |  4 ++
 .../src/main/resources/application.yml        |  3 +-
 .../yulichang/test/mapping/MappingTest.java   |  6 +--
 13 files changed, 102 insertions(+), 52 deletions(-)

diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
index 2d37bf3..eeba6eb 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
@@ -7,15 +7,18 @@ import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.config.MPJInterceptorConfig;
 import com.github.yulichang.config.enums.LogicDelTypeEnum;
 import com.github.yulichang.extension.mapping.config.MappingConfig;
-import com.github.yulichang.toolkit.SpringContentUtils;
 import com.github.yulichang.injector.MPJSqlInjector;
 import com.github.yulichang.interceptor.MPJInterceptor;
+import com.github.yulichang.toolkit.SpringContentUtils;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -35,6 +38,7 @@ import org.springframework.core.annotation.Order;
 
 import javax.sql.DataSource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * springboot 自动配置类
@@ -42,7 +46,6 @@ import java.util.List;
  * @author yulichang
  * @since 1.3.7
  */
-@SuppressWarnings("ALL")
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class})
 @ConditionalOnSingleCandidate(DataSource.class)
@@ -52,13 +55,12 @@ public class MybatisPlusJoinAutoConfiguration {
 
     private static final Logger logger = LoggerFactory.getLogger(MybatisPlusJoinAutoConfiguration.class);
 
-
     @SuppressWarnings("FieldCanBeLocal")
     private final MybatisPlusJoinProperties properties;
 
-
     public MybatisPlusJoinAutoConfiguration(MybatisPlusJoinProperties properties) {
         this.properties = properties;
+        ConfigProperties.banner = properties.getBanner();
         ConfigProperties.subTableLogic = properties.getSubTableLogic();
         ConfigProperties.msCache = properties.isMsCache();
         ConfigProperties.tableAlias = properties.getTableAlias();
@@ -81,6 +83,7 @@ public class MybatisPlusJoinAutoConfiguration {
      * mybatis plus 拦截器配置
      */
     @Bean
+    @Order(Ordered.HIGHEST_PRECEDENCE)
     @ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class})
     public MPJInterceptorConfig mpjInterceptorConfig(@Autowired(required = false) List<SqlSessionFactory> sqlSessionFactoryList) {
         return new MPJInterceptorConfig(sqlSessionFactoryList, properties.getBanner());
@@ -112,41 +115,52 @@ public class MybatisPlusJoinAutoConfiguration {
         return new MPJSqlInjector();
     }
 
-    /**
-     * springboot context 工具类
-     */
-    @Bean
-    @Order(Ordered.HIGHEST_PRECEDENCE)
-    @ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class})
-    public SpringContentUtils mpjSpringContent(@Autowired(required = false) MPJSpringContext springContext) {
-        return new SpringContentUtils(springContext);
-    }
-
     @Configuration
     @Order(Ordered.HIGHEST_PRECEDENCE)
     @ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class})
     public static class MPJMappingConfig implements ApplicationListener<ApplicationReadyEvent> {
+
         @Override
         @SuppressWarnings("NullableProblems")
         public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
-            new MappingConfig();
+            MappingConfig.init();
         }
     }
 
     @Configuration
     @ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class})
-    public static class MPJSpringContext implements SpringContentUtils.SpringContext, ApplicationContextAware {
+    public static class MPJSpringContext implements SpringContentUtils.SpringContext, BeanFactoryPostProcessor, ApplicationContextAware {
 
         private ApplicationContext applicationContext;
 
+        private ListableBeanFactory listableBeanFactory;
+
         @Override
         public <T> T getBean(Class<T> clazz) {
-            return this.applicationContext.getBean(clazz);
+            return getBeanFactory().getBean(clazz);
         }
 
         @Override
+        public <T> Map<String, T> getBeansOfType(Class<T> clazz) {
+            return getBeanFactory().getBeansOfType(clazz);
+        }
+
+        private ListableBeanFactory getBeanFactory() {
+            return applicationContext == null ? listableBeanFactory : applicationContext;
+        }
+
+        @Override
+        @SuppressWarnings("NullableProblems")
         public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
             this.applicationContext = applicationContext;
+            SpringContentUtils.setSpringContext(this);
+        }
+
+        @Override
+        @SuppressWarnings("NullableProblems")
+        public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
+            this.listableBeanFactory = beanFactory;
+            SpringContentUtils.setSpringContext(this);
         }
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
index 7151dd8..e110c34 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
@@ -10,6 +10,10 @@ import com.github.yulichang.config.enums.LogicDelTypeEnum;
  */
 public class ConfigProperties {
 
+    /**
+     * 是否开启副表逻辑删除
+     */
+    public static boolean banner = true;
     /**
      * 是否开启副表逻辑删除
      */
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SpringContentUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SpringContentUtils.java
index 64b366d..5cbd1f2 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SpringContentUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SpringContentUtils.java
@@ -4,8 +4,11 @@ package com.github.yulichang.toolkit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.apache.ibatis.session.SqlSession;
 
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -14,18 +17,26 @@ import java.util.Objects;
  * @author yulichang
  * @since 1.2.0
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class SpringContentUtils {
 
     private static SpringContext springContext;
 
-    public SpringContentUtils(SpringContext springContext) {
-        SpringContentUtils.springContext = springContext;
+    public static void setSpringContext(SpringContext springContext) {
+        if (Objects.isNull(SpringContentUtils.springContext)) {
+            SpringContentUtils.springContext = springContext;
+        }
     }
 
     public static <T> T getBean(Class<T> clazz) {
         return SpringContentUtils.springContext.getBean(clazz);
     }
 
+    @SuppressWarnings("UnusedReturnValue")
+    public static <T> Map<String, T> getBeansOfType(Class<T> clazz) {
+        return SpringContentUtils.springContext.getBeansOfType(clazz);
+    }
+
     @SuppressWarnings("unchecked")
     public static <T> T getMapper(Class<?> clazz) {
         if (Objects.isNull(springContext)) {
@@ -45,5 +56,7 @@ public class SpringContentUtils {
     public interface SpringContext {
 
         <T> T getBean(Class<T> clazz);
+
+        <T> Map<String, T> getBeansOfType(Class<T> clazz);
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java
index 5cad42f..7bde51c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java
@@ -1,12 +1,15 @@
 package com.github.yulichang.toolkit;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
+import com.github.yulichang.config.MPJInterceptorConfig;
 
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @author yulichang
@@ -14,6 +17,8 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class TableHelper {
 
+    private static final AtomicBoolean load = new AtomicBoolean(false);
+
     private static final Map<Class<?>, TableInfo> TABLE_INFO_CACHE = new ConcurrentHashMap<>();
 
     public static void init(Class<?> newClass, Class<?> oldClass) {
@@ -46,6 +51,13 @@ public class TableHelper {
             }
             if (Objects.nonNull(info)) {
                 TABLE_INFO_CACHE.put(currentClass, info);
+            } else {
+                if (!load.get()) {
+                    SpringContentUtils.getBean(MPJInterceptorConfig.class);
+                    SpringContentUtils.getBeansOfType(BaseMapper.class);
+                    load.set(true);
+                    return get(clazz);
+                }
             }
             return info;
         } else {
diff --git a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/config/DeepConfig.java b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/config/DeepConfig.java
index 1b2d11d..5879f55 100644
--- a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/config/DeepConfig.java
+++ b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/config/DeepConfig.java
@@ -18,24 +18,21 @@ import java.util.Objects;
  * @author yulichang
  * @since 1.4.5
  */
+@Getter
 @Accessors(chain = true)
 public class DeepConfig<T> {
 
     private static final DeepConfig<?> defaultConfig = new DeepConfig<>();
 
-    @Getter
     @Setter
     private List<SFunction<T, ?>> property;
 
-    @Getter
     @Setter
     private boolean loop = false;
 
-    @Getter
     @Setter
     private int deep = ConfigProperties.mappingMaxCount;
 
-    @Getter
     @Setter
     private int maxDeep = ConfigProperties.mappingMaxCount;
 
diff --git a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/config/MappingConfig.java b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/config/MappingConfig.java
index b3185b9..e694fb1 100644
--- a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/config/MappingConfig.java
+++ b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/config/MappingConfig.java
@@ -1,8 +1,10 @@
 package com.github.yulichang.extension.mapping.config;
 
-import com.github.yulichang.extension.mapping.mapper.MPJTableInfoHelper;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
+import com.github.yulichang.extension.mapping.mapper.MPJTableInfoHelper;
 import com.github.yulichang.toolkit.MPJTableMapperHelper;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 
 /**
  * 关系映射配置
@@ -10,9 +12,10 @@ import com.github.yulichang.toolkit.MPJTableMapperHelper;
  * @author yulichang
  * @since 1.2.0
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class MappingConfig {
 
-    public MappingConfig() {
+    public static void init() {
         TableInfoHelper.getTableInfos().forEach(i ->
                 MPJTableInfoHelper.initTableInfo(i.getEntityType(), MPJTableMapperHelper.getMapper(i.getEntityType())));
     }
diff --git a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java
index dd757f2..0c630c6 100644
--- a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java
+++ b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java
@@ -295,8 +295,7 @@ public class MPJTableFieldInfo {
 
     public BaseMapper<?> getJoinMapper() {
         if (this.joinMapper == null) {
-            MPJTableInfo joinTableInfo = MPJTableInfoHelper.getTableInfos().stream().filter(table ->
-                    table.getTableInfo().getEntityType() == this.joinClass).findFirst().orElse(null);
+            MPJTableInfo joinTableInfo = MPJTableInfoHelper.getTableInfo(this.joinClass);
             if (joinTableInfo == null) {
                 throw ExceptionUtils.mpe("未注册 mapper " + this.joinClass.getName());
             }
diff --git a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableInfoHelper.java b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableInfoHelper.java
index 46e08c8..e643c66 100644
--- a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableInfoHelper.java
+++ b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableInfoHelper.java
@@ -1,20 +1,24 @@
 package com.github.yulichang.extension.mapping.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
 import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 import com.github.yulichang.annotation.EntityMapping;
 import com.github.yulichang.annotation.FieldMapping;
+import com.github.yulichang.extension.mapping.config.MappingConfig;
 import com.github.yulichang.toolkit.MPJReflectionKit;
+import com.github.yulichang.toolkit.SpringContentUtils;
 import com.github.yulichang.toolkit.TableHelper;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * 拷贝 {@link TableInfoHelper}
@@ -24,6 +28,8 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class MPJTableInfoHelper {
 
+    private static final AtomicBoolean load = new AtomicBoolean(false);
+
     /**
      * 储存反射类表信息
      */
@@ -41,18 +47,17 @@ public class MPJTableInfoHelper {
         if (clazz == null || MPJReflectionKit.isPrimitiveOrWrapper(clazz) || clazz == String.class || clazz.isInterface()) {
             return null;
         }
-        return TABLE_INFO_CACHE.get(clazz);
-    }
-
-    /**
-     * <p>
-     * 获取所有实体映射表信息
-     * </p>
-     *
-     * @return 数据库表反射信息集合
-     */
-    public static List<MPJTableInfo> getTableInfos() {
-        return Collections.unmodifiableList(new ArrayList<>(TABLE_INFO_CACHE.values()));
+        MPJTableInfo tableInfo = TABLE_INFO_CACHE.get(clazz);
+        if (Objects.nonNull(tableInfo)) {
+            return tableInfo;
+        }
+        if (!load.get()) {
+            SpringContentUtils.getBeansOfType(BaseMapper.class);
+            MappingConfig.init();
+            load.set(true);
+            return getTableInfo(clazz);
+        }
+        return null;
     }
 
     /**
@@ -121,6 +126,4 @@ public class MPJTableInfoHelper {
         /* 映射字段列表 */
         mpjTableInfo.setFieldList(mpjFieldList);
     }
-
-
-}
+}
\ No newline at end of file
diff --git a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/Application.java b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/Application.java
index 17db94f..98201ee 100644
--- a/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/Application.java
+++ b/mybatis-plus-join-test/test-join/src/main/java/com/github/yulichang/test/join/Application.java
@@ -1,9 +1,7 @@
 package com.github.yulichang.test.join;
 
-import com.baomidou.mybatisplus.core.injector.ISqlInjector;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 
 @ComponentScan(basePackages = "com.github.yulichang.test")
@@ -11,9 +9,7 @@ import org.springframework.context.annotation.ComponentScan;
 public class Application {
 
     public static void main(String[] args) {
-        ConfigurableApplicationContext run = SpringApplication.run(Application.class, args);
-        ISqlInjector bean = run.getBean(ISqlInjector.class);
-        System.out.println(bean);
+        SpringApplication.run(Application.class, args);
     }
 
 }
diff --git a/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/Application.java b/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/Application.java
index ac05ee2..2e3e228 100644
--- a/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/Application.java
+++ b/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/Application.java
@@ -1,5 +1,6 @@
 package com.github.yulichang.test.mapping;
 
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 
@@ -7,4 +8,7 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringBootApplication
 public class Application {
 
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
 }
diff --git a/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/entity/UserDO.java b/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/entity/UserDO.java
index f79e673..1248b01 100644
--- a/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/entity/UserDO.java
+++ b/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/entity/UserDO.java
@@ -51,4 +51,8 @@ public class UserDO {
 //    @EntityMapping(thisField = "id", joinField = "pid")
     @FieldMapping(tag = UserDO.class, thisField = "id", joinField = "pid", select = "head_img")
     private List<String> pName;
+
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "userId")
+    private List<AddressDO> addressList;
 }
diff --git a/mybatis-plus-join-test/test-mapping/src/main/resources/application.yml b/mybatis-plus-join-test/test-mapping/src/main/resources/application.yml
index a60d6c4..e0b1978 100644
--- a/mybatis-plus-join-test/test-mapping/src/main/resources/application.yml
+++ b/mybatis-plus-join-test/test-mapping/src/main/resources/application.yml
@@ -23,4 +23,5 @@ mybatis-plus:
 # 打印 mybatis plus join banner
 mybatis-plus-join:
   banner: true
-  sub-table-logic: true
\ No newline at end of file
+  sub-table-logic: true
+  logic-del-type: where
\ No newline at end of file
diff --git a/mybatis-plus-join-test/test-mapping/src/test/java/com/github/yulichang/test/mapping/MappingTest.java b/mybatis-plus-join-test/test-mapping/src/test/java/com/github/yulichang/test/mapping/MappingTest.java
index b029a9b..b9cc704 100644
--- a/mybatis-plus-join-test/test-mapping/src/test/java/com/github/yulichang/test/mapping/MappingTest.java
+++ b/mybatis-plus-join-test/test-mapping/src/test/java/com/github/yulichang/test/mapping/MappingTest.java
@@ -6,9 +6,9 @@ import com.github.yulichang.test.mapping.entity.UserDO;
 import com.github.yulichang.test.mapping.service.UserService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -18,7 +18,7 @@ import java.util.List;
 @SuppressWarnings("unused")
 class MappingTest {
 
-    @Resource
+    @Autowired
     private UserService userService;
 
     @Test
@@ -47,7 +47,7 @@ class MappingTest {
         MPJLambdaWrapper<UserDO> wrapper = new MPJLambdaWrapper<UserDO>()
                 .selectAll(UserDO.class)
                 .leftJoin(AddressDO.class, AddressDO::getId, UserDO::getAddressId);
-        List<UserDO> dos = userService.listDeep(wrapper, conf -> conf.loop(true));
+        List<UserDO> dos = userService.listDeep(wrapper, conf -> conf.loop(false));
         System.out.println(1);
     }
 }

From 3fbeb1c84a8dcafa7127a253220a5b775361d853 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Thu, 21 Dec 2023 06:40:07 +0800
Subject: [PATCH 38/88] =?UTF-8?q?=E4=BC=98=E5=8C=96=20mapper=20not=20find?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/github/yulichang/toolkit/TableHelper.java     | 7 +++----
 .../extension/mapping/mapper/MPJTableInfoHelper.java       | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java
index 7bde51c..5de0cfd 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java
@@ -9,7 +9,6 @@ import com.github.yulichang.config.MPJInterceptorConfig;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * @author yulichang
@@ -17,7 +16,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 public class TableHelper {
 
-    private static final AtomicBoolean load = new AtomicBoolean(false);
+    private static boolean load = false;
 
     private static final Map<Class<?>, TableInfo> TABLE_INFO_CACHE = new ConcurrentHashMap<>();
 
@@ -52,10 +51,10 @@ public class TableHelper {
             if (Objects.nonNull(info)) {
                 TABLE_INFO_CACHE.put(currentClass, info);
             } else {
-                if (!load.get()) {
+                if (!load) {
                     SpringContentUtils.getBean(MPJInterceptorConfig.class);
                     SpringContentUtils.getBeansOfType(BaseMapper.class);
-                    load.set(true);
+                    load = true;
                     return get(clazz);
                 }
             }
diff --git a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableInfoHelper.java b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableInfoHelper.java
index e643c66..5f9ddd4 100644
--- a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableInfoHelper.java
+++ b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableInfoHelper.java
@@ -18,7 +18,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * 拷贝 {@link TableInfoHelper}
@@ -28,7 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 public class MPJTableInfoHelper {
 
-    private static final AtomicBoolean load = new AtomicBoolean(false);
+    private static boolean load = false;
 
     /**
      * 储存反射类表信息
@@ -51,10 +50,10 @@ public class MPJTableInfoHelper {
         if (Objects.nonNull(tableInfo)) {
             return tableInfo;
         }
-        if (!load.get()) {
+        if (!load) {
             SpringContentUtils.getBeansOfType(BaseMapper.class);
             MappingConfig.init();
-            load.set(true);
+            load = true;
             return getTableInfo(clazz);
         }
         return null;

From d0774a06f1bab5ee018ecb80a244e0740badb53c Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 22 Dec 2023 03:37:13 +0800
Subject: [PATCH 39/88] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MybatisPlusJoinAutoConfiguration.java     | 29 ++++++++++++-------
 .../MybatisPlusJoinPropertiesConsumer.java    | 18 ++++++++++++
 .../yulichang/injector/MPJSqlInjector.java    | 12 ++++++--
 3 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinPropertiesConsumer.java

diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
index eeba6eb..02a4651 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
@@ -16,7 +16,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -39,6 +39,7 @@ import org.springframework.core.annotation.Order;
 import javax.sql.DataSource;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * springboot 自动配置类
@@ -58,16 +59,22 @@ public class MybatisPlusJoinAutoConfiguration {
     @SuppressWarnings("FieldCanBeLocal")
     private final MybatisPlusJoinProperties properties;
 
-    public MybatisPlusJoinAutoConfiguration(MybatisPlusJoinProperties properties) {
-        this.properties = properties;
-        ConfigProperties.banner = properties.getBanner();
-        ConfigProperties.subTableLogic = properties.getSubTableLogic();
-        ConfigProperties.msCache = properties.isMsCache();
-        ConfigProperties.tableAlias = properties.getTableAlias();
-        ConfigProperties.joinPrefix = properties.getJoinPrefix();
-        ConfigProperties.logicDelType = "where".equalsIgnoreCase(properties.getLogicDelType()) ?
+    public MybatisPlusJoinAutoConfiguration(MybatisPlusJoinProperties properties,
+                                            ObjectProvider<MybatisPlusJoinPropertiesConsumer> propertiesConsumers) {
+        MybatisPlusJoinPropertiesConsumer propertiesConsumer = propertiesConsumers.getIfAvailable();
+        if (Objects.nonNull(propertiesConsumer)) {
+            this.properties = propertiesConsumer.config(properties);
+        } else {
+            this.properties = properties;
+        }
+        ConfigProperties.banner = this.properties.getBanner();
+        ConfigProperties.subTableLogic = this.properties.getSubTableLogic();
+        ConfigProperties.msCache = this.properties.isMsCache();
+        ConfigProperties.tableAlias = this.properties.getTableAlias();
+        ConfigProperties.joinPrefix = this.properties.getJoinPrefix();
+        ConfigProperties.logicDelType = "where".equalsIgnoreCase(this.properties.getLogicDelType()) ?
                 LogicDelTypeEnum.WHERE : LogicDelTypeEnum.ON;
-        ConfigProperties.mappingMaxCount = properties.getMappingMaxCount();
+        ConfigProperties.mappingMaxCount = this.properties.getMappingMaxCount();
     }
 
     /**
@@ -85,7 +92,7 @@ public class MybatisPlusJoinAutoConfiguration {
     @Bean
     @Order(Ordered.HIGHEST_PRECEDENCE)
     @ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class})
-    public MPJInterceptorConfig mpjInterceptorConfig(@Autowired(required = false) List<SqlSessionFactory> sqlSessionFactoryList) {
+    public MPJInterceptorConfig mpjInterceptorConfig(List<SqlSessionFactory> sqlSessionFactoryList) {
         return new MPJInterceptorConfig(sqlSessionFactoryList, properties.getBanner());
     }
 
diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinPropertiesConsumer.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinPropertiesConsumer.java
new file mode 100644
index 0000000..3c8a86b
--- /dev/null
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinPropertiesConsumer.java
@@ -0,0 +1,18 @@
+package com.github.yulichang.autoconfigure;
+
+/**
+ * 自定义配置
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+public interface MybatisPlusJoinPropertiesConsumer {
+
+    /**
+     * 自定义配置，此方法会覆盖配置文件中的MPJ配置
+     *
+     * @param properties 配置文件里的配置
+     * @return 修改后的配置
+     */
+    MybatisPlusJoinProperties config(MybatisPlusJoinProperties properties);
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java
index b51e61c..1b54db1 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/injector/MPJSqlInjector.java
@@ -11,11 +11,11 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
 import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
+import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.adapter.v3431.AbstractMethodV3431;
 import com.github.yulichang.method.*;
 import com.github.yulichang.toolkit.MPJTableMapperHelper;
 import com.github.yulichang.toolkit.TableHelper;
-import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.toolkit.reflect.GenericTypeUtils;
 import lombok.Getter;
 import org.apache.ibatis.builder.MapperBuilderAssistant;
@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Supplier;
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toList;
@@ -167,7 +168,14 @@ public class MPJSqlInjector extends DefaultSqlInjector {
         Class<?> modelClass = getSuperClassGenericType(mapperClass, Mapper.class, 0);
         super.inspectInject(builderAssistant, mapperClass);
         MPJTableMapperHelper.init(modelClass, mapperClass);
-        TableHelper.init(modelClass, extractModelClassOld(mapperClass));
+        Supplier<Class<?>> supplier = () -> {
+            try {
+                return extractModelClassOld(mapperClass);
+            } catch (Throwable throwable) {
+                return null;
+            }
+        };
+        TableHelper.init(modelClass, supplier.get());
     }
 
     public static Class<?> getSuperClassGenericType(final Class<?> clazz, final Class<?> genericIfc, final int index) {

From a822c4f78e8d95fbb9f60702b2f744315a3f1dd1 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 22 Dec 2023 05:01:47 +0800
Subject: [PATCH 40/88] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autoconfigure/MybatisPlusJoinAutoConfiguration.java  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
index 02a4651..db86189 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
@@ -39,7 +39,7 @@ import org.springframework.core.annotation.Order;
 import javax.sql.DataSource;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
+import java.util.Optional;
 
 /**
  * springboot 自动配置类
@@ -61,12 +61,7 @@ public class MybatisPlusJoinAutoConfiguration {
 
     public MybatisPlusJoinAutoConfiguration(MybatisPlusJoinProperties properties,
                                             ObjectProvider<MybatisPlusJoinPropertiesConsumer> propertiesConsumers) {
-        MybatisPlusJoinPropertiesConsumer propertiesConsumer = propertiesConsumers.getIfAvailable();
-        if (Objects.nonNull(propertiesConsumer)) {
-            this.properties = propertiesConsumer.config(properties);
-        } else {
-            this.properties = properties;
-        }
+        this.properties = Optional.ofNullable(propertiesConsumers.getIfAvailable()).map(c -> c.config(properties)).orElse(properties);
         ConfigProperties.banner = this.properties.getBanner();
         ConfigProperties.subTableLogic = this.properties.getSubTableLogic();
         ConfigProperties.msCache = this.properties.isMsCache();

From 665e43305172c81c99df290d36ad123eacfdb0ef Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sat, 23 Dec 2023 16:55:51 +0800
Subject: [PATCH 41/88] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ifAbsent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MybatisPlusJoinAutoConfiguration.java     |  21 ++-
 .../MybatisPlusJoinProperties.java            |  15 +-
 ...itional-spring-configuration-metadata.json |  23 +--
 .../yulichang/config/ConfigProperties.java    |  15 +-
 .../config/MybatisPlusJoinIfAbsent.java       |  12 ++
 .../yulichang/config/enums/IfAbsentEnum.java  |  40 +++++
 .../yulichang/kt/KtAbstractWrapper.java       |  22 ++-
 .../kt/interfaces/CompareIfAbsent.java        |  97 ++++++++++++
 .../query/MPJLambdaQueryWrapper.java          | 147 +++++++++++++++--
 .../yulichang/query/MPJQueryWrapper.java      |  55 ++++++-
 .../query/interfaces/CompareIfAbsent.java     | 149 ++++++++++++++++++
 .../yulichang/toolkit/MPJStringUtils.java     |  19 ++-
 .../yulichang/toolkit/ThrowOptional.java      |  53 +++++++
 .../yulichang/wrapper/MPJAbstractWrapper.java |  27 +++-
 .../yulichang/wrapper/MPJLambdaWrapper.java   |  10 +-
 .../wrapper/interfaces/CompareIfAbsent.java   |  96 +++++++++++
 .../interfaces/CompareStrIfAbsent.java        |  55 +++++++
 .../yulichang/test/join/QueryWrapperTest.java |  31 ++++
 .../yulichang/test/join/m/IfAbsentTest.java   |  66 ++++++++
 19 files changed, 895 insertions(+), 58 deletions(-)
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MybatisPlusJoinIfAbsent.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfAbsent.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/ThrowOptional.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java

diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
index db86189..0c7947f 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.injector.ISqlInjector;
 import com.github.yulichang.autoconfigure.conditional.MPJSqlInjectorCondition;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.config.MPJInterceptorConfig;
-import com.github.yulichang.config.enums.LogicDelTypeEnum;
+import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 import com.github.yulichang.extension.mapping.config.MappingConfig;
 import com.github.yulichang.injector.MPJSqlInjector;
 import com.github.yulichang.interceptor.MPJInterceptor;
@@ -56,20 +56,21 @@ public class MybatisPlusJoinAutoConfiguration {
 
     private static final Logger logger = LoggerFactory.getLogger(MybatisPlusJoinAutoConfiguration.class);
 
-    @SuppressWarnings("FieldCanBeLocal")
     private final MybatisPlusJoinProperties properties;
 
     public MybatisPlusJoinAutoConfiguration(MybatisPlusJoinProperties properties,
-                                            ObjectProvider<MybatisPlusJoinPropertiesConsumer> propertiesConsumers) {
+                                            ObjectProvider<MybatisPlusJoinPropertiesConsumer> propertiesConsumers,
+                                            ObjectProvider<MybatisPlusJoinIfAbsent> ifAbsentConsumers) {
         this.properties = Optional.ofNullable(propertiesConsumers.getIfAvailable()).map(c -> c.config(properties)).orElse(properties);
         ConfigProperties.banner = this.properties.getBanner();
         ConfigProperties.subTableLogic = this.properties.getSubTableLogic();
         ConfigProperties.msCache = this.properties.isMsCache();
         ConfigProperties.tableAlias = this.properties.getTableAlias();
         ConfigProperties.joinPrefix = this.properties.getJoinPrefix();
-        ConfigProperties.logicDelType = "where".equalsIgnoreCase(this.properties.getLogicDelType()) ?
-                LogicDelTypeEnum.WHERE : LogicDelTypeEnum.ON;
+        ConfigProperties.logicDelType = this.properties.getLogicDelType();
         ConfigProperties.mappingMaxCount = this.properties.getMappingMaxCount();
+        ConfigProperties.ifAbsent = Optional.ofNullable(ifAbsentConsumers.getIfAvailable()).orElse(this.properties.getIfAbsent());
+        info("mybatis plus join properties config complete");
     }
 
     /**
@@ -101,7 +102,7 @@ public class MybatisPlusJoinAutoConfiguration {
     @ConditionalOnBean(ISqlInjector.class)
     @ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class})
     public MPJSqlInjector mpjSqlInjector(ISqlInjector sqlInjector) {
-        logger.info("MPJSqlInjector init");
+        info("mybatis plus join SqlInjector init");
         return new MPJSqlInjector(sqlInjector);
     }
 
@@ -113,7 +114,7 @@ public class MybatisPlusJoinAutoConfiguration {
     @ConditionalOnMissingBean(ISqlInjector.class)
     @ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class})
     public MPJSqlInjector mpjSqlInjectorOnMiss() {
-        logger.info("MPJSqlInjector init");
+        info("mybatis plus join SqlInjector init");
         return new MPJSqlInjector();
     }
 
@@ -129,6 +130,12 @@ public class MybatisPlusJoinAutoConfiguration {
         }
     }
 
+    private void info(String info) {
+        if (properties.getBanner()) {
+            logger.info(info);
+        }
+    }
+
     @Configuration
     @ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class})
     public static class MPJSpringContext implements SpringContentUtils.SpringContext, BeanFactoryPostProcessor, ApplicationContextAware {
diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java
index 637f000..e30fe5a 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java
@@ -1,5 +1,7 @@
 package com.github.yulichang.autoconfigure;
 
+import com.github.yulichang.config.enums.IfAbsentEnum;
+import com.github.yulichang.config.enums.LogicDelTypeEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -43,7 +45,7 @@ public class MybatisPlusJoinProperties {
     /**
      * 逻辑删除类型 支持 where on
      */
-    private String logicDelType = "on";
+    private LogicDelTypeEnum logicDelType = LogicDelTypeEnum.ON;
 
     /**
      * 映射查询最大深度
@@ -54,4 +56,15 @@ public class MybatisPlusJoinProperties {
      * 子查询别名
      */
     private String subQueryAlias = "st";
+
+    /**
+     * Wrapper ifAbsent 判断策略
+     * <p>
+     * NOT_NULL 非null
+     * <p>
+     * NOT_EMPTY 非空字符串   例： "" -> false, " " -> true ...
+     * <p>
+     * NOT_BLANK 非空白字符串  例： "" -> false, " " -> false, "\r" -> false, "abc" -> true ...
+     */
+    private IfAbsentEnum ifAbsent = IfAbsentEnum.NOT_EMPTY;
 }
diff --git a/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index e0d1738..464b374 100644
--- a/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -40,8 +40,8 @@
     },
     {
       "name": "mybatis-plus-join.logic-del-type",
-      "defaultValue": "on",
-      "type": "java.lang.String",
+      "defaultValue": "com.github.yulichang.config.enums.LogicDelTypeEnum.ON",
+      "type": "com.github.yulichang.config.enums.LogicDelTypeEnum",
       "description": "逻辑删除的位置支持where和on两个."
     },
     {
@@ -55,21 +55,12 @@
       "defaultValue": "st",
       "type": "java.lang.String",
       "description": "子查询表别名."
-    }
-  ],
-  "hints": [
+    },
     {
-      "name": "mybatis-plus-join.logic-del-type",
-      "values": [
-        {
-          "value": "where",
-          "description": "logic delete condition to where."
-        },
-        {
-          "value": "on",
-          "description": "logic delete condition to on."
-        }
-      ]
+      "name": "mybatis-plus-join.ifAbsent",
+      "defaultValue": "com.github.yulichang.config.enums.IfAbsentEnum.NOT_EMPTY",
+      "type": "com.github.yulichang.config.enums.IfAbsentEnum",
+      "description": "IfAbsent方法判断策略,如需自定义请用@Bean形式MybatisPlusJoinIfAbsent."
     }
   ]
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
index e110c34..a777d84 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
@@ -2,6 +2,7 @@ package com.github.yulichang.config;
 
 import com.github.yulichang.adapter.AdapterHelper;
 import com.github.yulichang.adapter.base.ITableInfoAdapter;
+import com.github.yulichang.config.enums.IfAbsentEnum;
 import com.github.yulichang.config.enums.LogicDelTypeEnum;
 
 /**
@@ -11,7 +12,7 @@ import com.github.yulichang.config.enums.LogicDelTypeEnum;
 public class ConfigProperties {
 
     /**
-     * 是否开启副表逻辑删除
+     * 是否打印banner
      */
     public static boolean banner = true;
     /**
@@ -35,7 +36,7 @@ public class ConfigProperties {
      */
     public static LogicDelTypeEnum logicDelType = LogicDelTypeEnum.ON;
     /**
-     * 逻辑删除类型 支持 where on
+     * 映射查询最大深度
      */
     public static int mappingMaxCount = 5;
     /**
@@ -46,4 +47,14 @@ public class ConfigProperties {
      * 子查询别名
      */
     public static String subQueryAlias = "st";
+    /**
+     * Wrapper ifAbsent 判断策略
+     * <p>
+     * NOT_NULL 非null
+     * <p>
+     * NOT_EMPTY 非空字符串   例： "" -> false, " " -> true ...
+     * <p>
+     * NOT_BLANK 非空白字符串  例： "" -> false, " " -> false, "\r" -> false, "abc" -> true ...
+     */
+    public static MybatisPlusJoinIfAbsent ifAbsent = IfAbsentEnum.NOT_EMPTY;
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MybatisPlusJoinIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MybatisPlusJoinIfAbsent.java
new file mode 100644
index 0000000..e7e8b7a
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MybatisPlusJoinIfAbsent.java
@@ -0,0 +1,12 @@
+package com.github.yulichang.config;
+
+import java.util.function.Predicate;
+
+/**
+ * 自定义IfAbsent策略
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+public interface MybatisPlusJoinIfAbsent extends Predicate<Object> {
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java
new file mode 100644
index 0000000..91e7fa7
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java
@@ -0,0 +1,40 @@
+package com.github.yulichang.config.enums;
+
+import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
+import com.github.yulichang.toolkit.MPJStringUtils;
+
+import java.util.Objects;
+import java.util.function.Predicate;
+
+/**
+ * 条件判断策略
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+public enum IfAbsentEnum implements MybatisPlusJoinIfAbsent {
+
+    /**
+     * 非null
+     */
+    NOT_NULL(Objects::nonNull),
+    /**
+     * 非空字符串   例： "" -> false, " " -> true ...
+     */
+    NOT_EMPTY(val -> NOT_NULL.and(v -> v instanceof CharSequence).and(v -> MPJStringUtils.isNotEmpty((CharSequence) v)).test(val)),
+    /**
+     * NOT_BLANK 非空白字符串  例： "" -> false, " " -> false, "\r" -> false, "abc" -> true ...
+     */
+    NOT_BLANK(val -> NOT_NULL.and(v -> v instanceof CharSequence).and(v -> MPJStringUtils.isNotBlank((CharSequence) v)).test(val));
+
+    private final Predicate<Object> predicate;
+
+    IfAbsentEnum(Predicate<Object> predicate) {
+        this.predicate = predicate;
+    }
+
+    @Override
+    public boolean test(Object obj) {
+        return this.predicate.test(obj);
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
index b5bcb31..c8b05a8 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
@@ -11,7 +11,9 @@ import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
-import com.github.yulichang.kt.interfaces.Compare;
+import com.github.yulichang.config.ConfigProperties;
+import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
+import com.github.yulichang.kt.interfaces.CompareIfAbsent;
 import com.github.yulichang.kt.interfaces.Func;
 import com.github.yulichang.kt.interfaces.OnCompare;
 import com.github.yulichang.toolkit.KtUtils;
@@ -20,7 +22,7 @@ import com.github.yulichang.toolkit.Ref;
 import com.github.yulichang.toolkit.TableList;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
 import com.github.yulichang.wrapper.enums.PrefixEnum;
-import com.github.yulichang.wrapper.interfaces.CompareStr;
+import com.github.yulichang.wrapper.interfaces.CompareStrIfAbsent;
 import com.github.yulichang.wrapper.interfaces.FuncStr;
 import com.github.yulichang.wrapper.interfaces.Join;
 import kotlin.reflect.KProperty;
@@ -44,8 +46,8 @@ import static java.util.stream.Collectors.joining;
  */
 @SuppressWarnings({"unused", "unchecked", "DuplicatedCode"})
 public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T, Children>> extends Wrapper<T>
-        implements Compare<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
-        CompareStr<Children, String>, FuncStr<Children, String> {
+        implements CompareIfAbsent<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
+        CompareStrIfAbsent<Children, String>, FuncStr<Children, String> {
 
     /**
      * 占位符
@@ -121,6 +123,12 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      */
     protected boolean checkSqlInjection = false;
 
+    /**
+     * ifAbsent 策略
+     */
+    @Getter
+    protected MybatisPlusJoinIfAbsent ifAbsent = ConfigProperties.ifAbsent;
+
     @Override
     public T getEntity() {
         return entity;
@@ -172,6 +180,11 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         return typedThis;
     }
 
+    public Children setIfAbsent(MybatisPlusJoinIfAbsent ifAbsent) {
+        this.ifAbsent = ifAbsent;
+        return typedThis;
+    }
+
     @Override
     public Children allEq(boolean condition, Map<KProperty<?>, ?> params, boolean null2IsNull) {
         if (condition && CollectionUtils.isNotEmpty(params)) {
@@ -630,6 +643,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         index = null;
         isMain = true;
         isNo = false;
+        ifAbsent = ConfigProperties.ifAbsent;
     }
 
     /**
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java
new file mode 100644
index 0000000..39d552b
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java
@@ -0,0 +1,97 @@
+package com.github.yulichang.kt.interfaces;
+
+import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
+import kotlin.reflect.KProperty;
+
+/**
+ * ifAbsent
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public interface CompareIfAbsent<Children> extends Compare<Children> {
+
+    MybatisPlusJoinIfAbsent getIfAbsent();
+
+    default Children eqIfAbsent(KProperty<?> column, Object val) {
+        return eq(getIfAbsent().test(val), null, column, val);
+    }
+
+    default Children eqIfAbsent(String alias, KProperty<?> column, Object val) {
+        return eq(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default Children neIfAbsent(KProperty<?> column, Object val) {
+        return ne(getIfAbsent().test(val), null, column, val);
+    }
+
+    default Children neIfAbsent(String alias, KProperty<?> column, Object val) {
+        return ne(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default Children gtIfAbsent(KProperty<?> column, Object val) {
+        return gt(getIfAbsent().test(val), null, column, val);
+    }
+
+    default Children gtIfAbsent(String alias, KProperty<?> column, Object val) {
+        return gt(getIfAbsent().test(val), alias, column, val);
+    }
+
+
+    default Children geIfAbsent(KProperty<?> column, Object val) {
+        return ge(getIfAbsent().test(val), null, column, val);
+    }
+
+    default Children geIfAbsent(String alias, KProperty<?> column, Object val) {
+        return ge(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default Children ltIfAbsent(KProperty<?> column, Object val) {
+        return lt(getIfAbsent().test(val), null, column, val);
+    }
+
+    default Children ltIfAbsent(String alias, KProperty<?> column, Object val) {
+        return lt(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default Children leIfAbsent(KProperty<?> column, Object val) {
+        return le(getIfAbsent().test(val), null, column, val);
+    }
+
+    default Children leIfAbsent(String alias, KProperty<?> column, Object val) {
+        return le(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default Children likeIfAbsent(KProperty<?> column, Object val) {
+        return like(getIfAbsent().test(val), null, column, val);
+    }
+
+    default Children likeIfAbsent(String alisa, KProperty<?> column, Object val) {
+        return like(getIfAbsent().test(val), alisa, column, val);
+    }
+
+    default Children notLikeIfAbsent(KProperty<?> column, Object val) {
+        return notLike(getIfAbsent().test(val), null, column, val);
+    }
+
+    default Children notLikeIfAbsent(String alias, KProperty<?> column, Object val) {
+        return notLike(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default Children likeLeftIfAbsent(KProperty<?> column, Object val) {
+        return likeLeft(getIfAbsent().test(val), null, column, val);
+    }
+
+    default Children likeLeftIfAbsent(String alias, KProperty<?> column, Object val) {
+        return likeLeft(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default Children likeRightIfAbsent(KProperty<?> column, Object val) {
+        return likeRight(getIfAbsent().test(val), null, column, val);
+    }
+
+    default Children likeRightIfAbsent(String alias, KProperty<?> column, Object val) {
+        return likeRight(getIfAbsent().test(val), alias, column, val);
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
index df2069f..f2ee99a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
@@ -6,18 +6,22 @@ import com.baomidou.mybatisplus.core.conditions.query.Query;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.config.ConfigProperties;
+import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
+import com.github.yulichang.query.interfaces.CompareIfAbsent;
 import com.github.yulichang.query.interfaces.StringJoin;
 import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.TableHelper;
+import com.github.yulichang.toolkit.ThrowOptional;
+import lombok.Getter;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -30,7 +34,8 @@ import java.util.stream.Collectors;
  */
 @SuppressWarnings("unused")
 public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambdaQueryWrapper<T>>
-        implements Query<MPJLambdaQueryWrapper<T>, T, SFunction<T, ?>>, StringJoin<MPJLambdaQueryWrapper<T>, T> {
+        implements Query<MPJLambdaQueryWrapper<T>, T, SFunction<T, ?>>, StringJoin<MPJLambdaQueryWrapper<T>, T>,
+        CompareIfAbsent<MPJLambdaQueryWrapper<T>, SFunction<T, ?>> {
 
     /**
      * 查询字段
@@ -45,7 +50,8 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
     /**
      * 主表别名
      */
-    private final String alias = ConfigProperties.tableAlias;
+    @Getter
+    private String alias = ConfigProperties.tableAlias;
 
     /**
      * 查询的列
@@ -61,6 +67,17 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
      * 是否 select distinct
      */
     private boolean selectDistinct = false;
+    /**
+     * 主表逻辑删除
+     */
+    private boolean logicSql = true;
+    /**
+     * 动态表名
+     */
+    private Function<String, String> tableNameFunc;
+
+    @Getter
+    private MybatisPlusJoinIfAbsent ifAbsent = ConfigProperties.ifAbsent;
 
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(entity)
@@ -75,9 +92,10 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
     MPJLambdaQueryWrapper(T entity, Class<T> entityClass, SharedString from, SharedString sqlSelect, AtomicInteger paramNameSeq,
                           Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
                           SharedString lastSql, SharedString sqlComment, SharedString sqlFirst,
-                          List<String> selectColumns, List<String> ignoreColumns, boolean selectDistinct) {
+                          List<String> selectColumns, List<String> ignoreColumns, boolean selectDistinct,
+                          MybatisPlusJoinIfAbsent ifAbsent) {
         super.setEntity(entity);
-        super.setEntityClass(entityClass);
+        setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
         this.paramNameValuePairs = paramNameValuePairs;
         this.expression = mergeSegments;
@@ -85,10 +103,11 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
         this.from = from;
         this.lastSql = lastSql;
         this.sqlComment = sqlComment;
-        this.sqlFirst = sqlFirst;
+        ThrowOptional.tryDo(() -> this.sqlFirst = sqlFirst).catchDo();
         this.selectColumns = selectColumns;
         this.ignoreColumns = ignoreColumns;
         this.selectDistinct = selectDistinct;
+        this.ifAbsent = ifAbsent;
     }
 
     /**
@@ -214,7 +233,8 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
      */
     public MPJQueryWrapper<T> stringQuery() {
         return new MPJQueryWrapper<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs,
-                expression, sqlSelect, from, lastSql, sqlComment, sqlFirst, selectColumns, ignoreColumns, selectDistinct);
+                expression, sqlSelect, from, lastSql, sqlComment, sqlFirst, selectColumns, ignoreColumns,
+                selectDistinct, ifAbsent);
     }
 
     @Override
@@ -241,15 +261,86 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
         return from.getStringValue();
     }
 
-
-    public String getAlias() {
-        return alias;
+    public MPJLambdaQueryWrapper<T> setAlias(String alias) {
+        Assert.isTrue(StringUtils.isNotBlank(alias), "别名不能为空");
+        this.alias = alias;
+        return typedThis;
     }
 
+    /**
+     * 逻辑删除
+     */
+    public String getSubLogicSql() {
+        return StringPool.EMPTY;
+    }
+
+    /**
+     * 关闭主表逻辑删除
+     */
+    public MPJLambdaQueryWrapper<T> disableLogicDel() {
+        this.logicSql = false;
+        return typedThis;
+    }
+
+    /**
+     * 启用主表逻辑删除
+     */
+    public MPJLambdaQueryWrapper<T> enableLogicDel() {
+        this.logicSql = true;
+        return typedThis;
+    }
+
+    /**
+     * 逻辑删除
+     */
+    public boolean getLogicSql() {
+        return logicSql;
+    }
+
+
     public boolean getSelectDistinct() {
         return selectDistinct;
     }
 
+    /**
+     * 动态表名
+     * 如果主表需要动态表名,主表实体必须添加 @DynamicTableName 注解
+     * 关联表则不需要 加不加注解都会生效
+     * <p>
+     *
+     * @see com.github.yulichang.annotation.DynamicTableName
+     */
+    public MPJLambdaQueryWrapper<T> setTableName(Function<String, String> func) {
+        this.tableNameFunc = func;
+        return typedThis;
+    }
+
+    public String getTableName(String tableName) {
+        if (this.tableNameFunc == null) {
+            return tableName;
+        }
+        return this.tableNameFunc.apply(tableName);
+    }
+
+    @SuppressWarnings("DuplicatedCode")
+    public String getTableNameEnc(String tableName) {
+        String decode;
+        try {
+            decode = URLDecoder.decode(tableName, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            decode = tableName;
+        }
+        if (this.tableNameFunc == null) {
+            return decode;
+        }
+        return this.tableNameFunc.apply(decode);
+    }
+
+    public MPJLambdaQueryWrapper<T> setIfAbsent(MybatisPlusJoinIfAbsent ifAbsent) {
+        this.ifAbsent = ifAbsent;
+        return typedThis;
+    }
+
     /**
      * 用于生成嵌套 sql
      * <p>故 sqlSelect selectColumn ignoreColumns from不向下传递</p>
@@ -257,7 +348,34 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
     @Override
     protected MPJLambdaQueryWrapper<T> instance() {
         return new MPJLambdaQueryWrapper<>(getEntity(), getEntityClass(), null, null, paramNameSeq, paramNameValuePairs,
-                new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(), null, null, selectDistinct);
+                new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
+                null, null, selectDistinct, ifAbsent);
+    }
+
+    @Override
+    public Class<T> getEntityClass() {
+        try {
+            return super.getEntityClass();
+        } catch (Throwable throwable) {
+            return null;
+        }
+    }
+
+    @Override
+    public MPJLambdaQueryWrapper<T> setEntityClass(Class<T> entityClass) {
+        try {
+            return super.setEntityClass(entityClass);
+        } catch (Throwable throwable) {
+            return this;
+        }
+    }
+
+    public SharedString getSqlFirstField() {
+        try {
+            return sqlSelect;
+        } catch (Throwable throwable) {
+            return SharedString.emptyString();
+        }
     }
 
     @Override
@@ -267,6 +385,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
         from.toNull();
         selectColumns.clear();
         ignoreColumns.clear();
+        ifAbsent = ConfigProperties.ifAbsent;
     }
 
     @Override
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
index 8cab848..5e4f5d2 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
@@ -11,10 +11,13 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.config.ConfigProperties;
+import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
+import com.github.yulichang.query.interfaces.CompareIfAbsent;
 import com.github.yulichang.query.interfaces.StringJoin;
 import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.TableHelper;
+import com.github.yulichang.toolkit.ThrowOptional;
 import com.github.yulichang.wrapper.interfaces.Chain;
 import lombok.Getter;
 
@@ -38,7 +41,8 @@ import java.util.stream.Collectors;
  */
 @SuppressWarnings("unused")
 public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapper<T>> implements
-        Query<MPJQueryWrapper<T>, T, String>, StringJoin<MPJQueryWrapper<T>, T>, Chain<T> {
+        Query<MPJQueryWrapper<T>, T, String>, StringJoin<MPJQueryWrapper<T>, T>, Chain<T>,
+        CompareIfAbsent<MPJQueryWrapper<T>, String> {
 
     /**
      * 查询字段
@@ -85,6 +89,9 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
      */
     private boolean checkSqlInjection = false;
 
+    @Getter
+    private MybatisPlusJoinIfAbsent ifAbsent = ConfigProperties.ifAbsent;
+
 
     public MPJQueryWrapper() {
         super.initNeed();
@@ -115,9 +122,10 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
                            Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
                            SharedString sqlSelect, SharedString from, SharedString lastSql,
                            SharedString sqlComment, SharedString sqlFirst,
-                           List<String> selectColumns, List<String> ignoreColumns, boolean selectDistinct) {
+                           List<String> selectColumns, List<String> ignoreColumns, boolean selectDistinct,
+                           MybatisPlusJoinIfAbsent ifAbsent) {
         super.setEntity(entity);
-        super.setEntityClass(entityClass);
+        setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
         this.paramNameValuePairs = paramNameValuePairs;
         this.expression = mergeSegments;
@@ -125,10 +133,11 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
         this.lastSql = lastSql;
         this.from = from;
         this.sqlComment = sqlComment;
-        this.sqlFirst = sqlFirst;
+        ThrowOptional.tryDo(() -> this.sqlFirst = sqlFirst).catchDo();
         this.selectColumns = selectColumns;
         this.ignoreColumns = ignoreColumns;
         this.selectDistinct = selectDistinct;
+        this.ifAbsent = ifAbsent;
     }
 
     /**
@@ -139,6 +148,11 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
         return this;
     }
 
+    public MPJQueryWrapper<T> setIfAbsent(MybatisPlusJoinIfAbsent ifAbsent) {
+        this.ifAbsent = ifAbsent;
+        return this;
+    }
+
     @Override
     protected String columnToString(String column) {
         if (checkSqlInjection && MPJSqlInjectionUtils.check(column)) {
@@ -315,6 +329,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
         return this.tableNameFunc.apply(tableName);
     }
 
+    @SuppressWarnings("DuplicatedCode")
     public String getTableNameEnc(String tableName) {
         String decode;
         try {
@@ -333,7 +348,33 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
      */
     public MPJLambdaQueryWrapper<T> lambda() {
         return new MPJLambdaQueryWrapper<>(getEntity(), getEntityClass(), from, sqlSelect, paramNameSeq, paramNameValuePairs,
-                expression, lastSql, sqlComment, sqlFirst, selectColumns, ignoreColumns, selectDistinct);
+                expression, lastSql, sqlComment, getSqlFirstField(), selectColumns, ignoreColumns, selectDistinct, ifAbsent);
+    }
+
+    @Override
+    public Class<T> getEntityClass() {
+        try {
+            return super.getEntityClass();
+        } catch (Throwable throwable) {
+            return null;
+        }
+    }
+
+    @Override
+    public MPJQueryWrapper<T> setEntityClass(Class<T> entityClass) {
+        try {
+            return super.setEntityClass(entityClass);
+        } catch (Throwable throwable) {
+            return this;
+        }
+    }
+
+    public SharedString getSqlFirstField() {
+        try {
+            return sqlSelect;
+        } catch (Throwable throwable) {
+            return SharedString.emptyString();
+        }
     }
 
     /**
@@ -343,7 +384,8 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
     @Override
     protected MPJQueryWrapper<T> instance() {
         return new MPJQueryWrapper<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs, new MergeSegments(),
-                null, null, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(), null, null, selectDistinct);
+                null, null, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
+                null, null, selectDistinct, ifAbsent);
     }
 
 
@@ -354,6 +396,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
         from.toNull();
         selectColumns.clear();
         ignoreColumns.clear();
+        ifAbsent = ConfigProperties.ifAbsent;
     }
 
     @Override
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfAbsent.java
new file mode 100644
index 0000000..3867e5e
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfAbsent.java
@@ -0,0 +1,149 @@
+package com.github.yulichang.query.interfaces;
+
+import com.baomidou.mybatisplus.core.conditions.interfaces.Compare;
+import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
+
+/**
+ * 查询条件封装
+ * <p>比较值</p>
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
+
+    MybatisPlusJoinIfAbsent getIfAbsent();
+
+    /**
+     * 等于 =
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children eqIfAbsent(R column, Object val) {
+        return eq(getIfAbsent().test(val), column, val);
+    }
+
+    /**
+     * 不等于 &lt;&gt;
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children neIfAbsent(R column, Object val) {
+        return ne(getIfAbsent().test(val), column, val);
+    }
+
+    /**
+     * 大于 &gt;
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children gtIfAbsent(R column, Object val) {
+        return gt(getIfAbsent().test(val), column, val);
+    }
+
+    /**
+     * 大于等于 &gt;=
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children geIfAbsent(R column, Object val) {
+        return ge(getIfAbsent().test(val), column, val);
+    }
+
+    /**
+     * 小于 &lt;
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children ltIfAbsent(R column, Object val) {
+        return lt(getIfAbsent().test(val), column, val);
+    }
+
+    /**
+     * 小于等于 &lt;=
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children leIfAbsent(R column, Object val) {
+        return le(getIfAbsent().test(val), column, val);
+    }
+
+    /**
+     * LIKE '%值%'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children likeIfAbsent(R column, Object val) {
+        return like(getIfAbsent().test(val), column, val);
+    }
+
+    /**
+     * NOT LIKE '%值%'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children notLikeIfAbsent(R column, Object val) {
+        return notLike(getIfAbsent().test(val), column, val);
+    }
+
+    /**
+     * NOT LIKE '%值'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children notLikeLeftIfAbsent(R column, Object val) {
+        return notLikeLeft(getIfAbsent().test(val), column, val);
+    }
+
+    /**
+     * NOT LIKE '值%'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children notLikeRightIfAbsent(R column, Object val) {
+        return notLikeRight(getIfAbsent().test(val), column, val);
+    }
+
+    /**
+     * LIKE '%值'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children likeLeftIfAbsent(R column, Object val) {
+        return likeLeft(getIfAbsent().test(val), column, val);
+    }
+
+    /**
+     * LIKE '值%'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children likeRightIfAbsent(R column, Object val) {
+        return likeRight(getIfAbsent().test(val), column, val);
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJStringUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJStringUtils.java
index 0a8b55e..8506652 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJStringUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJStringUtils.java
@@ -598,10 +598,25 @@ public final class MPJStringUtils {
             /**
              * 过滤sql黑名单字符，存在 SQL 注入，去除空白内容
              */
-            Matcher matcher = REPLACE_BLANK.matcher(str);
-            str = matcher.replaceAll("");
+            str = replaceAllBlank(str);
 
         }
         return str;
     }
+
+    /**
+     * 字符串去除空白内容：
+     * <ul>
+     *     <li>\n 回车</li>
+     *     <li>\t 水平制表符</li>
+     *     <li>\s 空格</li>
+     *     <li>\r 换行</li>
+     * </ul>
+     *
+     * @param str 字符串
+     */
+    public static String replaceAllBlank(String str) {
+        Matcher matcher = REPLACE_BLANK.matcher(str);
+        return matcher.replaceAll("");
+    }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/ThrowOptional.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/ThrowOptional.java
new file mode 100644
index 0000000..f0fcc39
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/ThrowOptional.java
@@ -0,0 +1,53 @@
+package com.github.yulichang.toolkit;
+
+import java.util.Objects;
+import java.util.function.Consumer;
+
+/**
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public class ThrowOptional {
+
+    private ThrowOptional() {
+    }
+
+    private DoSomething doSomething;
+
+    public static ThrowOptional tryDo(DoSomething doSomething) {
+        ThrowOptional optional = new ThrowOptional();
+        Objects.requireNonNull(doSomething);
+        optional.doSomething = doSomething;
+        return optional;
+    }
+
+    public void catchDo() {
+        try {
+            this.doSomething.doSomething();
+        } catch (Throwable ignored) {
+        }
+    }
+
+    public void catchDo(DoSomething doSomething) {
+        try {
+            this.doSomething.doSomething();
+        } catch (Throwable ignored) {
+            doSomething.doSomething();
+        }
+    }
+
+    public void catchDo(Consumer<Throwable> consumer) {
+        try {
+            this.doSomething.doSomething();
+        } catch (Throwable throwable) {
+            consumer.accept(throwable);
+        }
+    }
+
+
+    @FunctionalInterface
+    public interface DoSomething {
+        void doSomething();
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
index d8ee2e4..d8d8b85 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
@@ -12,6 +12,8 @@ import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.github.yulichang.config.ConfigProperties;
+import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.Ref;
@@ -39,8 +41,8 @@ import static java.util.stream.Collectors.joining;
  */
 @SuppressWarnings({"unchecked", "unused", "DuplicatedCode"})
 public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<T, Children>> extends Wrapper<T>
-        implements Compare<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
-        CompareStr<Children, String>, FuncStr<Children, String> {
+        implements CompareIfAbsent<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
+        CompareStrIfAbsent<Children, String>, FuncStr<Children, String> {
 
     /**
      * 占位符
@@ -116,6 +118,12 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      */
     protected boolean checkSqlInjection = false;
 
+    /**
+     * ifAbsent 策略
+     */
+    @Getter
+    protected MybatisPlusJoinIfAbsent ifAbsent = ConfigProperties.ifAbsent;
+
     @Override
     public T getEntity() {
         return entity;
@@ -167,6 +175,18 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
         return typedThis;
     }
 
+    /**
+     * 设置 ifAbsent
+     * .setIfAbsent(val -> val != null && StringUtils.isNotBlank(val))
+     *
+     * @param ifAbsent 判断
+     * @return Children
+     */
+    public Children setIfAbsent(MybatisPlusJoinIfAbsent ifAbsent) {
+        this.ifAbsent = ifAbsent;
+        return typedThis;
+    }
+
     @Override
     public <X, V> Children allEq(boolean condition, Map<SFunction<X, ?>, V> params, boolean null2IsNull) {
         if (condition && CollectionUtils.isNotEmpty(params)) {
@@ -400,7 +420,7 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
     public <R> Children groupBy(boolean condition, String alias, List<SFunction<R, ?>> columns) {
         return maybeDo(condition, () -> {
             if (CollectionUtils.isNotEmpty(columns)) {
-                final String finalOne =  columnsToString(index, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, alias, columns);
+                final String finalOne = columnsToString(index, isOn ? PrefixEnum.ON_FIRST : PrefixEnum.CD_FIRST, alias, columns);
                 appendSqlSegments(GROUP_BY, () -> finalOne);
             }
         });
@@ -737,6 +757,7 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
         index = null;
         isMain = true;
         isOn = false;
+        ifAbsent = ConfigProperties.ifAbsent;
     }
 
     /**
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index 534882c..08ba2c5 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.config.ConfigProperties;
+import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.*;
 import com.github.yulichang.toolkit.support.ColumnCache;
@@ -123,7 +124,8 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     MPJLambdaWrapper(T entity, Class<T> entityClass, SharedString sqlSelect, AtomicInteger paramNameSeq,
                      Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments, SharedString paramAlias,
                      SharedString lastSql, SharedString sqlComment, SharedString sqlFirst,
-                     TableList tableList, Integer index, String keyWord, Class<?> joinClass, String tableName) {
+                     TableList tableList, Integer index, String keyWord, Class<?> joinClass, String tableName,
+                     MybatisPlusJoinIfAbsent ifAbsent) {
         super.setEntity(entity);
         super.setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -139,6 +141,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
         this.keyWord = keyWord;
         this.joinClass = joinClass;
         this.tableName = tableName;
+        this.ifAbsent = ifAbsent;
     }
 
 
@@ -207,7 +210,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
         MPJLambdaWrapper<E> wrapper = new MPJLambdaWrapper<E>(null, clazz, SharedString.emptyString(),
                 paramNameSeq, paramNameValuePairs, new MergeSegments(), new SharedString(this.paramAlias
                 .getStringValue()), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
-                new TableList(), null, null, null, null) {
+                new TableList(), null, null, null, null, ifAbsent) {
         };
         wrapper.tableList.setAlias(st);
         wrapper.tableList.setRootClass(clazz);
@@ -402,7 +405,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     protected MPJLambdaWrapper<T> instance(Integer index, String keyWord, Class<?> joinClass, String tableName) {
         return new MPJLambdaWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs,
                 new MergeSegments(), this.paramAlias, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
-                this.tableList, index, keyWord, joinClass, tableName);
+                this.tableList, index, keyWord, joinClass, tableName, ifAbsent);
     }
 
     @Override
@@ -415,5 +418,6 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
         if (Objects.nonNull(wrapperMap)) wrapperMap.clear();
         if (Objects.nonNull(unionSql)) unionSql.toEmpty();
         resultMapMybatisLabel.clear();
+        ifAbsent = ConfigProperties.ifAbsent;
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java
new file mode 100644
index 0000000..4a8943a
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java
@@ -0,0 +1,96 @@
+package com.github.yulichang.wrapper.interfaces;
+
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
+
+/**
+ * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public interface CompareIfAbsent<Children> extends Compare<Children> {
+
+    MybatisPlusJoinIfAbsent getIfAbsent();
+
+    default <R> Children eqIfAbsent(SFunction<R, ?> column, Object val) {
+        return eq(getIfAbsent().test(val), null, column, val);
+    }
+
+    default <R> Children eqIfAbsent(String alias, SFunction<R, ?> column, Object val) {
+        return eq(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default <R> Children neIfAbsent(SFunction<R, ?> column, Object val) {
+        return ne(getIfAbsent().test(val), null, column, val);
+    }
+
+    default <R> Children neIfAbsent(String alias, SFunction<R, ?> column, Object val) {
+        return ne(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default <R> Children gtIfAbsent(SFunction<R, ?> column, Object val) {
+        return gt(getIfAbsent().test(val), null, column, val);
+    }
+
+    default <R> Children gtIfAbsent(String alias, SFunction<R, ?> column, Object val) {
+        return gt(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default <R> Children geIfAbsent(SFunction<R, ?> column, Object val) {
+        return ge(getIfAbsent().test(val), null, column, val);
+    }
+
+    default <R> Children geIfAbsent(String alias, SFunction<R, ?> column, Object val) {
+        return ge(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default <R> Children ltIfAbsent(SFunction<R, ?> column, Object val) {
+        return lt(getIfAbsent().test(val), null, column, val);
+    }
+
+    default <R> Children ltIfAbsent(String alias, SFunction<R, ?> column, Object val) {
+        return lt(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default <R> Children leIfAbsent(SFunction<R, ?> column, Object val) {
+        return le(getIfAbsent().test(val), null, column, val);
+    }
+
+    default <R> Children leIfAbsent(String alias, SFunction<R, ?> column, Object val) {
+        return le(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default <R> Children likeIfAbsent(SFunction<R, ?> column, Object val) {
+        return like(getIfAbsent().test(val), null, column, val);
+    }
+
+    default <R> Children likeIfAbsent(String alias, SFunction<R, ?> column, Object val) {
+        return like(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default <R> Children notLikeIfAbsent(SFunction<R, ?> column, Object val) {
+        return notLike(getIfAbsent().test(val), null, column, val);
+    }
+
+    default <R> Children notLikeIfAbsent(String alias, SFunction<R, ?> column, Object val) {
+        return notLike(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default <R> Children likeLeftIfAbsent(SFunction<R, ?> column, Object val) {
+        return likeLeft(getIfAbsent().test(val), null, column, val);
+    }
+
+    default <R> Children likeLeftIfAbsent(String alias, SFunction<R, ?> column, Object val) {
+        return likeLeft(getIfAbsent().test(val), alias, column, val);
+    }
+
+    default <R> Children likeRightIfAbsent(SFunction<R, ?> column, Object val) {
+        return likeRight(getIfAbsent().test(val), null, column, val);
+    }
+
+    default <R> Children likeRightIfAbsent(String alias, SFunction<R, ?> column, Object val) {
+        return likeRight(getIfAbsent().test(val), alias, column, val);
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java
new file mode 100644
index 0000000..c9f5922
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java
@@ -0,0 +1,55 @@
+package com.github.yulichang.wrapper.interfaces;
+
+import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
+
+/**
+ * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public interface CompareStrIfAbsent<Children, R> extends CompareStr<Children, R> {
+
+    MybatisPlusJoinIfAbsent getIfAbsent();
+
+    default Children eqIfAbsent(R column, Object val) {
+        return eq(getIfAbsent().test(val), column, val);
+    }
+
+    default Children neIfAbsent(R column, Object val) {
+        return ne(getIfAbsent().test(val), column, val);
+    }
+
+    default Children gtIfAbsent(R column, Object val) {
+        return gt(getIfAbsent().test(val), column, val);
+    }
+
+    default Children geIfAbsent(R column, Object val) {
+        return ge(getIfAbsent().test(val), column, val);
+    }
+
+    default Children ltIfAbsent(R column, Object val) {
+        return lt(getIfAbsent().test(val), column, val);
+    }
+
+    default Children leIfAbsent(R column, Object val) {
+        return le(getIfAbsent().test(val), column, val);
+    }
+
+    default Children likeIfAbsent(R column, Object val) {
+        return like(getIfAbsent().test(val), column, val);
+    }
+
+    default Children notLikeIfAbsent(R column, Object val) {
+        return notLike(getIfAbsent().test(val), column, val);
+    }
+
+    default Children likeLeftIfAbsent(R column, Object val) {
+        return likeLeft(getIfAbsent().test(val), column, val);
+    }
+
+    default Children likeRightIfAbsent(R column, Object val) {
+        return likeRight(getIfAbsent().test(val), column, val);
+    }
+}
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/QueryWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/QueryWrapperTest.java
index 43ec2cc..afce143 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/QueryWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/QueryWrapperTest.java
@@ -115,4 +115,35 @@ class QueryWrapperTest {
         System.out.println(joinMaps);
     }
 
+    @Test
+    void test5() {
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
+                "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t LEFT JOIN address t2 ON t2.user_id = t.id " +
+                "WHERE t.del = false AND (t.id <= ?)");
+        List<UserDO> userDO = userMapper.selectJoinList(UserDO.class, new MPJQueryWrapper<UserDO>()
+                .selectAll(UserDO.class)
+                .leftJoin("address t2 on t2.user_id = t.id")
+                .le("t.id ", 10).lambda());
+        System.out.println(userDO);
+
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
+                "t.address_id2, t.del, t.create_by, t.update_by, t2.address AS userAddress FROM `user` t " +
+                "LEFT JOIN address t2 ON t2.user_id = t.id WHERE t.del = false AND (t.id <= ?)");
+        List<UserDTO> dto = userMapper.selectJoinList(UserDTO.class, new MPJQueryWrapper<UserDO>()
+                .selectAll(UserDO.class)
+                .select("t2.address AS userAddress")
+                .leftJoin("address t2 on t2.user_id = t.id")
+                .le("t.id ", 10).lambda());
+        System.out.println(dto);
+    }
+
+    @Test
+    void test6() {
+        ThreadLocalUtils.set("SELECT t.id AS idea, t.user_id AS uuid, t.tenant_id FROM user_tenant t WHERE (t.id <= ?) AND t.tenant_id = 1");
+        List<UserTenantDO> userDO = userTenantMapper.selectJoinList(UserTenantDO.class, new MPJQueryWrapper<UserTenantDO>()
+                .selectAll(UserTenantDO.class)
+                .le("t.id ", 10).lambda());
+        System.out.println(userDO);
+    }
+
 }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
new file mode 100644
index 0000000..fe46ba4
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
@@ -0,0 +1,66 @@
+package com.github.yulichang.test.join.m;
+
+import com.github.yulichang.config.enums.IfAbsentEnum;
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+@SpringBootTest
+public class IfAbsentTest {
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+    @Test
+    void ifAbsent() {
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
+                "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
+                "WHERE t.del = false AND (t.id = ? AND t.head_img = ? AND t.`name` = ?)");
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .eq(UserDO::getId, 1)
+                .eqIfAbsent(UserDO::getPid, null)
+                .eqIfAbsent(UserDO::getAddressId, "")
+                .eqIfAbsent(UserDO::getImg, "\t")
+                .eqIfAbsent(UserDO::getName, "张三 1");
+        List<UserDO> list = wrapper.list();
+        list.forEach(System.out::println);
+
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
+                "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
+                "WHERE t.del = false AND (t.id = ? AND t.`name` = ?)");
+        MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .setIfAbsent(IfAbsentEnum.NOT_BLANK)
+                .eq(UserDO::getId, 1)
+                .eqIfAbsent(UserDO::getPid, null)
+                .eqIfAbsent(UserDO::getAddressId, "")
+                .eqIfAbsent(UserDO::getImg, "\t")
+                .eqIfAbsent(UserDO::getName, "张三 1");
+        List<UserDO> list1 = wrapper1.list();
+        list1.forEach(System.out::println);
+
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
+                "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
+                "WHERE t.del = false AND (t.id = ? AND t.pid = ? AND t.`name` = ? AND t.head_img = ? AND t.`name` = ?)");
+        MPJLambdaWrapper<UserDO> wrapper2 = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .setIfAbsent(o -> true)
+                .eq(UserDO::getId, 1)
+                .eqIfAbsent(UserDO::getPid, null)
+                .eqIfAbsent(UserDO::getName, "")
+                .eqIfAbsent(UserDO::getImg, "\t")
+                .eqIfAbsent(UserDO::getName, "张三 1");
+        List<UserDO> list2 = wrapper2.list();
+        list2.forEach(System.out::println);
+    }
+}

From eda25c23f856f0c080be9276e6d1b6e31c4e3d0f Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sat, 23 Dec 2023 17:00:59 +0800
Subject: [PATCH 42/88] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ifAbsent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../META-INF/additional-spring-configuration-metadata.json      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 464b374..df4fbf5 100644
--- a/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -57,7 +57,7 @@
       "description": "子查询表别名."
     },
     {
-      "name": "mybatis-plus-join.ifAbsent",
+      "name": "mybatis-plus-join.if-absent",
       "defaultValue": "com.github.yulichang.config.enums.IfAbsentEnum.NOT_EMPTY",
       "type": "com.github.yulichang.config.enums.IfAbsentEnum",
       "description": "IfAbsent方法判断策略,如需自定义请用@Bean形式MybatisPlusJoinIfAbsent."

From a2756a9dde2a210f5a79f7fd0669da4aefc5ac6c Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sun, 24 Dec 2023 23:13:50 +0800
Subject: [PATCH 43/88] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ifAbsent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MybatisPlusJoinAutoConfiguration.java     | 10 ++--
 .../MybatisPlusJoinIfAbsentConsumer.java      | 14 ++++++
 .../MybatisPlusJoinPropertiesConsumer.java    |  4 +-
 .../yulichang/config/ConfigProperties.java    |  5 +-
 .../config/MybatisPlusJoinIfAbsent.java       | 12 -----
 .../yulichang/config/enums/IfAbsentEnum.java  | 20 ++++----
 .../yulichang/kt/KtAbstractWrapper.java       | 12 +++--
 .../kt/interfaces/CompareIfAbsent.java        | 46 ++++++++++---------
 .../query/MPJLambdaQueryWrapper.java          | 14 ++++--
 .../yulichang/query/MPJQueryWrapper.java      | 14 ++++--
 .../query/interfaces/CompareIfAbsent.java     | 30 ++++++------
 .../yulichang/wrapper/MPJAbstractWrapper.java | 14 ++++--
 .../yulichang/wrapper/MPJLambdaWrapper.java   |  5 +-
 .../wrapper/enums/IfAbsentSqlKeyWordEnum.java | 22 +++++++++
 .../wrapper/interfaces/CompareIfAbsent.java   | 46 ++++++++++---------
 .../interfaces/CompareStrIfAbsent.java        | 26 ++++++-----
 .../yulichang/test/join/m/IfAbsentTest.java   | 18 ++++++--
 17 files changed, 195 insertions(+), 117 deletions(-)
 create mode 100644 mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfAbsentConsumer.java
 rename mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/{ => consumer}/MybatisPlusJoinPropertiesConsumer.java (75%)
 delete mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MybatisPlusJoinIfAbsent.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfAbsentSqlKeyWordEnum.java

diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
index 0c7947f..94e6062 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
@@ -3,13 +3,15 @@ package com.github.yulichang.autoconfigure;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusLanguageDriverAutoConfiguration;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
 import com.github.yulichang.autoconfigure.conditional.MPJSqlInjectorCondition;
+import com.github.yulichang.autoconfigure.consumer.MybatisPlusJoinIfAbsentConsumer;
+import com.github.yulichang.autoconfigure.consumer.MybatisPlusJoinPropertiesConsumer;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.config.MPJInterceptorConfig;
-import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 import com.github.yulichang.extension.mapping.config.MappingConfig;
 import com.github.yulichang.injector.MPJSqlInjector;
 import com.github.yulichang.interceptor.MPJInterceptor;
 import com.github.yulichang.toolkit.SpringContentUtils;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.slf4j.Logger;
@@ -40,6 +42,7 @@ import javax.sql.DataSource;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.BiPredicate;
 
 /**
  * springboot 自动配置类
@@ -60,7 +63,7 @@ public class MybatisPlusJoinAutoConfiguration {
 
     public MybatisPlusJoinAutoConfiguration(MybatisPlusJoinProperties properties,
                                             ObjectProvider<MybatisPlusJoinPropertiesConsumer> propertiesConsumers,
-                                            ObjectProvider<MybatisPlusJoinIfAbsent> ifAbsentConsumers) {
+                                            ObjectProvider<MybatisPlusJoinIfAbsentConsumer> ifAbsentConsumers) {
         this.properties = Optional.ofNullable(propertiesConsumers.getIfAvailable()).map(c -> c.config(properties)).orElse(properties);
         ConfigProperties.banner = this.properties.getBanner();
         ConfigProperties.subTableLogic = this.properties.getSubTableLogic();
@@ -69,7 +72,8 @@ public class MybatisPlusJoinAutoConfiguration {
         ConfigProperties.joinPrefix = this.properties.getJoinPrefix();
         ConfigProperties.logicDelType = this.properties.getLogicDelType();
         ConfigProperties.mappingMaxCount = this.properties.getMappingMaxCount();
-        ConfigProperties.ifAbsent = Optional.ofNullable(ifAbsentConsumers.getIfAvailable()).orElse(this.properties.getIfAbsent());
+        ConfigProperties.ifAbsent = Optional.ofNullable(ifAbsentConsumers.getIfAvailable())
+                .map(m -> (BiPredicate<Object, IfAbsentSqlKeyWordEnum>) m).orElse(this.properties.getIfAbsent());
         info("mybatis plus join properties config complete");
     }
 
diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfAbsentConsumer.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfAbsentConsumer.java
new file mode 100644
index 0000000..3e2287c
--- /dev/null
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfAbsentConsumer.java
@@ -0,0 +1,14 @@
+package com.github.yulichang.autoconfigure.consumer;
+
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
+
+/**
+ * 自定义IfAbsent策略
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+public interface MybatisPlusJoinIfAbsentConsumer extends BiPredicate<Object, IfAbsentSqlKeyWordEnum> {
+}
diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinPropertiesConsumer.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinPropertiesConsumer.java
similarity index 75%
rename from mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinPropertiesConsumer.java
rename to mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinPropertiesConsumer.java
index 3c8a86b..24a4dc8 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinPropertiesConsumer.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinPropertiesConsumer.java
@@ -1,4 +1,6 @@
-package com.github.yulichang.autoconfigure;
+package com.github.yulichang.autoconfigure.consumer;
+
+import com.github.yulichang.autoconfigure.MybatisPlusJoinProperties;
 
 /**
  * 自定义配置
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
index a777d84..b5335fa 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
@@ -4,6 +4,9 @@ import com.github.yulichang.adapter.AdapterHelper;
 import com.github.yulichang.adapter.base.ITableInfoAdapter;
 import com.github.yulichang.config.enums.IfAbsentEnum;
 import com.github.yulichang.config.enums.LogicDelTypeEnum;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
 
 /**
  * @author yulichang
@@ -56,5 +59,5 @@ public class ConfigProperties {
      * <p>
      * NOT_BLANK 非空白字符串  例： "" -> false, " " -> false, "\r" -> false, "abc" -> true ...
      */
-    public static MybatisPlusJoinIfAbsent ifAbsent = IfAbsentEnum.NOT_EMPTY;
+    public static BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent = IfAbsentEnum.NOT_EMPTY;
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MybatisPlusJoinIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MybatisPlusJoinIfAbsent.java
deleted file mode 100644
index e7e8b7a..0000000
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MybatisPlusJoinIfAbsent.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.yulichang.config;
-
-import java.util.function.Predicate;
-
-/**
- * 自定义IfAbsent策略
- *
- * @author yulichang
- * @since 1.4.9
- */
-public interface MybatisPlusJoinIfAbsent extends Predicate<Object> {
-}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java
index 91e7fa7..f04f852 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java
@@ -1,10 +1,10 @@
 package com.github.yulichang.config.enums;
 
-import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 import com.github.yulichang.toolkit.MPJStringUtils;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
 
 import java.util.Objects;
-import java.util.function.Predicate;
+import java.util.function.BiPredicate;
 
 /**
  * 条件判断策略
@@ -12,29 +12,29 @@ import java.util.function.Predicate;
  * @author yulichang
  * @since 1.4.9
  */
-public enum IfAbsentEnum implements MybatisPlusJoinIfAbsent {
+public enum IfAbsentEnum implements BiPredicate<Object, IfAbsentSqlKeyWordEnum> {
 
     /**
      * 非null
      */
-    NOT_NULL(Objects::nonNull),
+    NOT_NULL((val, key) -> Objects.nonNull(val)),
     /**
      * 非空字符串   例： "" -> false, " " -> true ...
      */
-    NOT_EMPTY(val -> NOT_NULL.and(v -> v instanceof CharSequence).and(v -> MPJStringUtils.isNotEmpty((CharSequence) v)).test(val)),
+    NOT_EMPTY((val, key) -> NOT_NULL.test(val, key) && (!(val instanceof CharSequence) || MPJStringUtils.isNotEmpty((CharSequence) val))),
     /**
      * NOT_BLANK 非空白字符串  例： "" -> false, " " -> false, "\r" -> false, "abc" -> true ...
      */
-    NOT_BLANK(val -> NOT_NULL.and(v -> v instanceof CharSequence).and(v -> MPJStringUtils.isNotBlank((CharSequence) v)).test(val));
+    NOT_BLANK((val, key) -> NOT_NULL.test(val, key) && (!(val instanceof CharSequence) || MPJStringUtils.isNotBlank((CharSequence) val)));
 
-    private final Predicate<Object> predicate;
+    private final BiPredicate<Object, IfAbsentSqlKeyWordEnum> predicate;
 
-    IfAbsentEnum(Predicate<Object> predicate) {
+    IfAbsentEnum(BiPredicate<Object, IfAbsentSqlKeyWordEnum> predicate) {
         this.predicate = predicate;
     }
 
     @Override
-    public boolean test(Object obj) {
-        return this.predicate.test(obj);
+    public boolean test(Object obj, IfAbsentSqlKeyWordEnum keyword) {
+        return this.predicate.test(obj, keyword);
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
index c8b05a8..981aec3 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 import com.github.yulichang.kt.interfaces.CompareIfAbsent;
 import com.github.yulichang.kt.interfaces.Func;
 import com.github.yulichang.kt.interfaces.OnCompare;
@@ -21,6 +20,7 @@ import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.Ref;
 import com.github.yulichang.toolkit.TableList;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
 import com.github.yulichang.wrapper.enums.PrefixEnum;
 import com.github.yulichang.wrapper.interfaces.CompareStrIfAbsent;
 import com.github.yulichang.wrapper.interfaces.FuncStr;
@@ -32,6 +32,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import static com.baomidou.mybatisplus.core.enums.SqlKeyword.*;
@@ -127,7 +128,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
      * ifAbsent 策略
      */
     @Getter
-    protected MybatisPlusJoinIfAbsent ifAbsent = ConfigProperties.ifAbsent;
+    protected BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent = ConfigProperties.ifAbsent;
 
     @Override
     public T getEntity() {
@@ -180,11 +181,16 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         return typedThis;
     }
 
-    public Children setIfAbsent(MybatisPlusJoinIfAbsent ifAbsent) {
+    public Children setIfAbsent(BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
         this.ifAbsent = ifAbsent;
         return typedThis;
     }
 
+    public Children setIfAbsent(Predicate<Object> ifAbsent) {
+        this.ifAbsent = (o, k) -> ifAbsent.test(o);
+        return typedThis;
+    }
+
     @Override
     public Children allEq(boolean condition, Map<KProperty<?>, ?> params, boolean null2IsNull) {
         if (condition && CollectionUtils.isNotEmpty(params)) {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java
index 39d552b..f379a63 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java
@@ -1,8 +1,10 @@
 package com.github.yulichang.kt.interfaces;
 
-import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
 import kotlin.reflect.KProperty;
 
+import java.util.function.BiPredicate;
+
 /**
  * ifAbsent
  *
@@ -12,86 +14,86 @@ import kotlin.reflect.KProperty;
 @SuppressWarnings("unused")
 public interface CompareIfAbsent<Children> extends Compare<Children> {
 
-    MybatisPlusJoinIfAbsent getIfAbsent();
+    BiPredicate<Object, IfAbsentSqlKeyWordEnum> getIfAbsent();
 
     default Children eqIfAbsent(KProperty<?> column, Object val) {
-        return eq(getIfAbsent().test(val), null, column, val);
+        return eq(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.EQ), null, column, val);
     }
 
     default Children eqIfAbsent(String alias, KProperty<?> column, Object val) {
-        return eq(getIfAbsent().test(val), alias, column, val);
+        return eq(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.EQ), alias, column, val);
     }
 
     default Children neIfAbsent(KProperty<?> column, Object val) {
-        return ne(getIfAbsent().test(val), null, column, val);
+        return ne(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NE), null, column, val);
     }
 
     default Children neIfAbsent(String alias, KProperty<?> column, Object val) {
-        return ne(getIfAbsent().test(val), alias, column, val);
+        return ne(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NE), alias, column, val);
     }
 
     default Children gtIfAbsent(KProperty<?> column, Object val) {
-        return gt(getIfAbsent().test(val), null, column, val);
+        return gt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GT), null, column, val);
     }
 
     default Children gtIfAbsent(String alias, KProperty<?> column, Object val) {
-        return gt(getIfAbsent().test(val), alias, column, val);
+        return gt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GT), alias, column, val);
     }
 
 
     default Children geIfAbsent(KProperty<?> column, Object val) {
-        return ge(getIfAbsent().test(val), null, column, val);
+        return ge(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GE), null, column, val);
     }
 
     default Children geIfAbsent(String alias, KProperty<?> column, Object val) {
-        return ge(getIfAbsent().test(val), alias, column, val);
+        return ge(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GE), alias, column, val);
     }
 
     default Children ltIfAbsent(KProperty<?> column, Object val) {
-        return lt(getIfAbsent().test(val), null, column, val);
+        return lt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LT), null, column, val);
     }
 
     default Children ltIfAbsent(String alias, KProperty<?> column, Object val) {
-        return lt(getIfAbsent().test(val), alias, column, val);
+        return lt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LT), alias, column, val);
     }
 
     default Children leIfAbsent(KProperty<?> column, Object val) {
-        return le(getIfAbsent().test(val), null, column, val);
+        return le(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LE), null, column, val);
     }
 
     default Children leIfAbsent(String alias, KProperty<?> column, Object val) {
-        return le(getIfAbsent().test(val), alias, column, val);
+        return le(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LE), alias, column, val);
     }
 
     default Children likeIfAbsent(KProperty<?> column, Object val) {
-        return like(getIfAbsent().test(val), null, column, val);
+        return like(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE), null, column, val);
     }
 
     default Children likeIfAbsent(String alisa, KProperty<?> column, Object val) {
-        return like(getIfAbsent().test(val), alisa, column, val);
+        return like(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE), alisa, column, val);
     }
 
     default Children notLikeIfAbsent(KProperty<?> column, Object val) {
-        return notLike(getIfAbsent().test(val), null, column, val);
+        return notLike(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE), null, column, val);
     }
 
     default Children notLikeIfAbsent(String alias, KProperty<?> column, Object val) {
-        return notLike(getIfAbsent().test(val), alias, column, val);
+        return notLike(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE), alias, column, val);
     }
 
     default Children likeLeftIfAbsent(KProperty<?> column, Object val) {
-        return likeLeft(getIfAbsent().test(val), null, column, val);
+        return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), null, column, val);
     }
 
     default Children likeLeftIfAbsent(String alias, KProperty<?> column, Object val) {
-        return likeLeft(getIfAbsent().test(val), alias, column, val);
+        return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), alias, column, val);
     }
 
     default Children likeRightIfAbsent(KProperty<?> column, Object val) {
-        return likeRight(getIfAbsent().test(val), null, column, val);
+        return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), null, column, val);
     }
 
     default Children likeRightIfAbsent(String alias, KProperty<?> column, Object val) {
-        return likeRight(getIfAbsent().test(val), alias, column, val);
+        return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), alias, column, val);
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
index f2ee99a..ac13e59 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
@@ -9,18 +9,19 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 import com.github.yulichang.query.interfaces.CompareIfAbsent;
 import com.github.yulichang.query.interfaces.StringJoin;
 import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.ThrowOptional;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
 import lombok.Getter;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -77,7 +78,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
     private Function<String, String> tableNameFunc;
 
     @Getter
-    private MybatisPlusJoinIfAbsent ifAbsent = ConfigProperties.ifAbsent;
+    private BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent = ConfigProperties.ifAbsent;
 
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(entity)
@@ -93,7 +94,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
                           Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
                           SharedString lastSql, SharedString sqlComment, SharedString sqlFirst,
                           List<String> selectColumns, List<String> ignoreColumns, boolean selectDistinct,
-                          MybatisPlusJoinIfAbsent ifAbsent) {
+                          BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
         super.setEntity(entity);
         setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -336,11 +337,16 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
         return this.tableNameFunc.apply(decode);
     }
 
-    public MPJLambdaQueryWrapper<T> setIfAbsent(MybatisPlusJoinIfAbsent ifAbsent) {
+    public MPJLambdaQueryWrapper<T> setIfAbsent(BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
         this.ifAbsent = ifAbsent;
         return typedThis;
     }
 
+    public MPJLambdaQueryWrapper<T> setIfAbsent(Predicate<Object> ifAbsent) {
+        this.ifAbsent = (o, k) -> ifAbsent.test(o);
+        return typedThis;
+    }
+
     /**
      * 用于生成嵌套 sql
      * <p>故 sqlSelect selectColumn ignoreColumns from不向下传递</p>
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
index 5e4f5d2..4031175 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
@@ -11,13 +11,13 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 import com.github.yulichang.query.interfaces.CompareIfAbsent;
 import com.github.yulichang.query.interfaces.StringJoin;
 import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.ThrowOptional;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
 import com.github.yulichang.wrapper.interfaces.Chain;
 import lombok.Getter;
 
@@ -28,6 +28,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -90,7 +91,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
     private boolean checkSqlInjection = false;
 
     @Getter
-    private MybatisPlusJoinIfAbsent ifAbsent = ConfigProperties.ifAbsent;
+    private BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent = ConfigProperties.ifAbsent;
 
 
     public MPJQueryWrapper() {
@@ -123,7 +124,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
                            SharedString sqlSelect, SharedString from, SharedString lastSql,
                            SharedString sqlComment, SharedString sqlFirst,
                            List<String> selectColumns, List<String> ignoreColumns, boolean selectDistinct,
-                           MybatisPlusJoinIfAbsent ifAbsent) {
+                           BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
         super.setEntity(entity);
         setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -148,11 +149,16 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
         return this;
     }
 
-    public MPJQueryWrapper<T> setIfAbsent(MybatisPlusJoinIfAbsent ifAbsent) {
+    public MPJQueryWrapper<T> setIfAbsent(BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
         this.ifAbsent = ifAbsent;
         return this;
     }
 
+    public MPJQueryWrapper<T> setIfAbsent(Predicate<Object> ifAbsent) {
+        this.ifAbsent = (o, k) -> ifAbsent.test(o);
+        return this;
+    }
+
     @Override
     protected String columnToString(String column) {
         if (checkSqlInjection && MPJSqlInjectionUtils.check(column)) {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfAbsent.java
index 3867e5e..ccf8eb8 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfAbsent.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfAbsent.java
@@ -1,7 +1,9 @@
 package com.github.yulichang.query.interfaces;
 
 import com.baomidou.mybatisplus.core.conditions.interfaces.Compare;
-import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
 
 /**
  * 查询条件封装
@@ -13,7 +15,7 @@ import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 @SuppressWarnings("unused")
 public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
 
-    MybatisPlusJoinIfAbsent getIfAbsent();
+    BiPredicate<Object, IfAbsentSqlKeyWordEnum> getIfAbsent();
 
     /**
      * 等于 =
@@ -23,7 +25,7 @@ public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
      * @return children
      */
     default Children eqIfAbsent(R column, Object val) {
-        return eq(getIfAbsent().test(val), column, val);
+        return eq(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.EQ), column, val);
     }
 
     /**
@@ -34,7 +36,7 @@ public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
      * @return children
      */
     default Children neIfAbsent(R column, Object val) {
-        return ne(getIfAbsent().test(val), column, val);
+        return ne(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NE), column, val);
     }
 
     /**
@@ -45,7 +47,7 @@ public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
      * @return children
      */
     default Children gtIfAbsent(R column, Object val) {
-        return gt(getIfAbsent().test(val), column, val);
+        return gt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GT), column, val);
     }
 
     /**
@@ -56,7 +58,7 @@ public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
      * @return children
      */
     default Children geIfAbsent(R column, Object val) {
-        return ge(getIfAbsent().test(val), column, val);
+        return ge(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GE), column, val);
     }
 
     /**
@@ -67,7 +69,7 @@ public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
      * @return children
      */
     default Children ltIfAbsent(R column, Object val) {
-        return lt(getIfAbsent().test(val), column, val);
+        return lt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LT), column, val);
     }
 
     /**
@@ -78,7 +80,7 @@ public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
      * @return children
      */
     default Children leIfAbsent(R column, Object val) {
-        return le(getIfAbsent().test(val), column, val);
+        return le(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LE), column, val);
     }
 
     /**
@@ -89,7 +91,7 @@ public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
      * @return children
      */
     default Children likeIfAbsent(R column, Object val) {
-        return like(getIfAbsent().test(val), column, val);
+        return like(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE), column, val);
     }
 
     /**
@@ -100,7 +102,7 @@ public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
      * @return children
      */
     default Children notLikeIfAbsent(R column, Object val) {
-        return notLike(getIfAbsent().test(val), column, val);
+        return notLike(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE), column, val);
     }
 
     /**
@@ -111,7 +113,7 @@ public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
      * @return children
      */
     default Children notLikeLeftIfAbsent(R column, Object val) {
-        return notLikeLeft(getIfAbsent().test(val), column, val);
+        return notLikeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_LEFT), column, val);
     }
 
     /**
@@ -122,7 +124,7 @@ public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
      * @return children
      */
     default Children notLikeRightIfAbsent(R column, Object val) {
-        return notLikeRight(getIfAbsent().test(val), column, val);
+        return notLikeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_RIGHT), column, val);
     }
 
     /**
@@ -133,7 +135,7 @@ public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
      * @return children
      */
     default Children likeLeftIfAbsent(R column, Object val) {
-        return likeLeft(getIfAbsent().test(val), column, val);
+        return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), column, val);
     }
 
     /**
@@ -144,6 +146,6 @@ public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
      * @return children
      */
     default Children likeRightIfAbsent(R column, Object val) {
-        return likeRight(getIfAbsent().test(val), column, val);
+        return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), column, val);
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
index d8d8b85..cd22de1 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
@@ -13,12 +13,12 @@ import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.Ref;
 import com.github.yulichang.toolkit.TableList;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
 import com.github.yulichang.wrapper.enums.PrefixEnum;
 import com.github.yulichang.wrapper.interfaces.*;
 import lombok.Getter;
@@ -27,6 +27,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import static com.baomidou.mybatisplus.core.enums.SqlKeyword.*;
@@ -122,7 +123,7 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      * ifAbsent 策略
      */
     @Getter
-    protected MybatisPlusJoinIfAbsent ifAbsent = ConfigProperties.ifAbsent;
+    protected BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent = ConfigProperties.ifAbsent;
 
     @Override
     public T getEntity() {
@@ -175,6 +176,11 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
         return typedThis;
     }
 
+    public Children setIfAbsent(BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
+        this.ifAbsent = ifAbsent;
+        return typedThis;
+    }
+
     /**
      * 设置 ifAbsent
      * .setIfAbsent(val -> val != null && StringUtils.isNotBlank(val))
@@ -182,8 +188,8 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
      * @param ifAbsent 判断
      * @return Children
      */
-    public Children setIfAbsent(MybatisPlusJoinIfAbsent ifAbsent) {
-        this.ifAbsent = ifAbsent;
+    public Children setIfAbsent(Predicate<Object> ifAbsent) {
+        this.ifAbsent = (obj, key) -> ifAbsent.test(obj);
         return typedThis;
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index 08ba2c5..dcf5c84 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.*;
 import com.github.yulichang.toolkit.support.ColumnCache;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
 import com.github.yulichang.wrapper.interfaces.Chain;
 import com.github.yulichang.wrapper.interfaces.Query;
 import com.github.yulichang.wrapper.interfaces.QueryLabel;
@@ -20,6 +20,7 @@ import lombok.Getter;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -125,7 +126,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
                      Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments, SharedString paramAlias,
                      SharedString lastSql, SharedString sqlComment, SharedString sqlFirst,
                      TableList tableList, Integer index, String keyWord, Class<?> joinClass, String tableName,
-                     MybatisPlusJoinIfAbsent ifAbsent) {
+                     BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
         super.setEntity(entity);
         super.setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfAbsentSqlKeyWordEnum.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfAbsentSqlKeyWordEnum.java
new file mode 100644
index 0000000..43ad591
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfAbsentSqlKeyWordEnum.java
@@ -0,0 +1,22 @@
+package com.github.yulichang.wrapper.enums;
+
+/**
+ * if absent 枚举
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+public enum IfAbsentSqlKeyWordEnum {
+    EQ,
+    NE,
+    GT,
+    GE,
+    LT,
+    LE,
+    LIKE,
+    NOT_LIKE,
+    LIKE_RIGHT,
+    NOT_LIKE_RIGHT,
+    LIKE_LEFT,
+    NOT_LIKE_LEFT
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java
index 4a8943a..2ac6ca4 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java
@@ -1,7 +1,9 @@
 package com.github.yulichang.wrapper.interfaces;
 
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
 
 /**
  * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
@@ -12,85 +14,85 @@ import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 @SuppressWarnings("unused")
 public interface CompareIfAbsent<Children> extends Compare<Children> {
 
-    MybatisPlusJoinIfAbsent getIfAbsent();
+    BiPredicate<Object, IfAbsentSqlKeyWordEnum> getIfAbsent();
 
     default <R> Children eqIfAbsent(SFunction<R, ?> column, Object val) {
-        return eq(getIfAbsent().test(val), null, column, val);
+        return eq(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.EQ), null, column, val);
     }
 
     default <R> Children eqIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return eq(getIfAbsent().test(val), alias, column, val);
+        return eq(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.EQ), alias, column, val);
     }
 
     default <R> Children neIfAbsent(SFunction<R, ?> column, Object val) {
-        return ne(getIfAbsent().test(val), null, column, val);
+        return ne(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NE), null, column, val);
     }
 
     default <R> Children neIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return ne(getIfAbsent().test(val), alias, column, val);
+        return ne(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NE), alias, column, val);
     }
 
     default <R> Children gtIfAbsent(SFunction<R, ?> column, Object val) {
-        return gt(getIfAbsent().test(val), null, column, val);
+        return gt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GT), null, column, val);
     }
 
     default <R> Children gtIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return gt(getIfAbsent().test(val), alias, column, val);
+        return gt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GT), alias, column, val);
     }
 
     default <R> Children geIfAbsent(SFunction<R, ?> column, Object val) {
-        return ge(getIfAbsent().test(val), null, column, val);
+        return ge(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GE), null, column, val);
     }
 
     default <R> Children geIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return ge(getIfAbsent().test(val), alias, column, val);
+        return ge(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GE), alias, column, val);
     }
 
     default <R> Children ltIfAbsent(SFunction<R, ?> column, Object val) {
-        return lt(getIfAbsent().test(val), null, column, val);
+        return lt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LT), null, column, val);
     }
 
     default <R> Children ltIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return lt(getIfAbsent().test(val), alias, column, val);
+        return lt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LT), alias, column, val);
     }
 
     default <R> Children leIfAbsent(SFunction<R, ?> column, Object val) {
-        return le(getIfAbsent().test(val), null, column, val);
+        return le(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LE), null, column, val);
     }
 
     default <R> Children leIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return le(getIfAbsent().test(val), alias, column, val);
+        return le(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LE), alias, column, val);
     }
 
     default <R> Children likeIfAbsent(SFunction<R, ?> column, Object val) {
-        return like(getIfAbsent().test(val), null, column, val);
+        return like(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE), null, column, val);
     }
 
     default <R> Children likeIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return like(getIfAbsent().test(val), alias, column, val);
+        return like(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE), alias, column, val);
     }
 
     default <R> Children notLikeIfAbsent(SFunction<R, ?> column, Object val) {
-        return notLike(getIfAbsent().test(val), null, column, val);
+        return notLike(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE), null, column, val);
     }
 
     default <R> Children notLikeIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return notLike(getIfAbsent().test(val), alias, column, val);
+        return notLike(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE), alias, column, val);
     }
 
     default <R> Children likeLeftIfAbsent(SFunction<R, ?> column, Object val) {
-        return likeLeft(getIfAbsent().test(val), null, column, val);
+        return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), null, column, val);
     }
 
     default <R> Children likeLeftIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return likeLeft(getIfAbsent().test(val), alias, column, val);
+        return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), alias, column, val);
     }
 
     default <R> Children likeRightIfAbsent(SFunction<R, ?> column, Object val) {
-        return likeRight(getIfAbsent().test(val), null, column, val);
+        return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), null, column, val);
     }
 
     default <R> Children likeRightIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return likeRight(getIfAbsent().test(val), alias, column, val);
+        return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), alias, column, val);
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java
index c9f5922..aede362 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java
@@ -1,6 +1,8 @@
 package com.github.yulichang.wrapper.interfaces;
 
-import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
 
 /**
  * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
@@ -11,45 +13,45 @@ import com.github.yulichang.config.MybatisPlusJoinIfAbsent;
 @SuppressWarnings("unused")
 public interface CompareStrIfAbsent<Children, R> extends CompareStr<Children, R> {
 
-    MybatisPlusJoinIfAbsent getIfAbsent();
+    BiPredicate<Object, IfAbsentSqlKeyWordEnum> getIfAbsent();
 
     default Children eqIfAbsent(R column, Object val) {
-        return eq(getIfAbsent().test(val), column, val);
+        return eq(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.EQ), column, val);
     }
 
     default Children neIfAbsent(R column, Object val) {
-        return ne(getIfAbsent().test(val), column, val);
+        return ne(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NE), column, val);
     }
 
     default Children gtIfAbsent(R column, Object val) {
-        return gt(getIfAbsent().test(val), column, val);
+        return gt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GT), column, val);
     }
 
     default Children geIfAbsent(R column, Object val) {
-        return ge(getIfAbsent().test(val), column, val);
+        return ge(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GE), column, val);
     }
 
     default Children ltIfAbsent(R column, Object val) {
-        return lt(getIfAbsent().test(val), column, val);
+        return lt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LT), column, val);
     }
 
     default Children leIfAbsent(R column, Object val) {
-        return le(getIfAbsent().test(val), column, val);
+        return le(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LE), column, val);
     }
 
     default Children likeIfAbsent(R column, Object val) {
-        return like(getIfAbsent().test(val), column, val);
+        return like(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE), column, val);
     }
 
     default Children notLikeIfAbsent(R column, Object val) {
-        return notLike(getIfAbsent().test(val), column, val);
+        return notLike(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE), column, val);
     }
 
     default Children likeLeftIfAbsent(R column, Object val) {
-        return likeLeft(getIfAbsent().test(val), column, val);
+        return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), column, val);
     }
 
     default Children likeRightIfAbsent(R column, Object val) {
-        return likeRight(getIfAbsent().test(val), column, val);
+        return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), column, val);
     }
 }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
index fe46ba4..2235568 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
@@ -22,12 +22,24 @@ public class IfAbsentTest {
 
     @Test
     void ifAbsent() {
+        assert IfAbsentEnum.NOT_EMPTY.test("\t", null);
+        assert !IfAbsentEnum.NOT_EMPTY.test("", null);
+        assert IfAbsentEnum.NOT_EMPTY.test(" ", null);
+        assert IfAbsentEnum.NOT_EMPTY.test("\r", null);
+        assert IfAbsentEnum.NOT_EMPTY.test("a", null);
+
+        assert !IfAbsentEnum.NOT_BLANK.test("\t", null);
+        assert !IfAbsentEnum.NOT_BLANK.test("", null);
+        assert !IfAbsentEnum.NOT_BLANK.test(" ", null);
+        assert !IfAbsentEnum.NOT_BLANK.test("\r", null);
+        assert IfAbsentEnum.NOT_BLANK.test("a", null);
+
         ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
                 "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
                 "WHERE t.del = false AND (t.id = ? AND t.head_img = ? AND t.`name` = ?)");
         MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
-                .eq(UserDO::getId, 1)
+                .eqIfAbsent(UserDO::getId, 1)
                 .eqIfAbsent(UserDO::getPid, null)
                 .eqIfAbsent(UserDO::getAddressId, "")
                 .eqIfAbsent(UserDO::getImg, "\t")
@@ -41,7 +53,7 @@ public class IfAbsentTest {
         MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
                 .setIfAbsent(IfAbsentEnum.NOT_BLANK)
-                .eq(UserDO::getId, 1)
+                .eqIfAbsent(UserDO::getId, 1)
                 .eqIfAbsent(UserDO::getPid, null)
                 .eqIfAbsent(UserDO::getAddressId, "")
                 .eqIfAbsent(UserDO::getImg, "\t")
@@ -55,7 +67,7 @@ public class IfAbsentTest {
         MPJLambdaWrapper<UserDO> wrapper2 = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
                 .setIfAbsent(o -> true)
-                .eq(UserDO::getId, 1)
+                .eqIfAbsent(UserDO::getId, 1)
                 .eqIfAbsent(UserDO::getPid, null)
                 .eqIfAbsent(UserDO::getName, "")
                 .eqIfAbsent(UserDO::getImg, "\t")

From a2bdce761424185003c3771dc7358c15125b7531 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sun, 24 Dec 2023 23:37:14 +0800
Subject: [PATCH 44/88] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ifAbsent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MybatisPlusJoinAutoConfiguration.java     |  3 ++-
 .../yulichang/config/ConfigProperties.java    |  2 +-
 .../yulichang/config/enums/IfAbsentEnum.java  | 19 +++++++++---------
 .../yulichang/test/join/m/IfAbsentTest.java   | 20 +++++++++----------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
index 94e6062..3d8a6e5 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
@@ -73,7 +73,8 @@ public class MybatisPlusJoinAutoConfiguration {
         ConfigProperties.logicDelType = this.properties.getLogicDelType();
         ConfigProperties.mappingMaxCount = this.properties.getMappingMaxCount();
         ConfigProperties.ifAbsent = Optional.ofNullable(ifAbsentConsumers.getIfAvailable())
-                .map(m -> (BiPredicate<Object, IfAbsentSqlKeyWordEnum>) m).orElse(this.properties.getIfAbsent());
+                .map(m -> (BiPredicate<Object, IfAbsentSqlKeyWordEnum>) m)
+                .orElse((val, key) -> this.properties.getIfAbsent().test(val));
         info("mybatis plus join properties config complete");
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
index b5335fa..64b2a9a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
@@ -59,5 +59,5 @@ public class ConfigProperties {
      * <p>
      * NOT_BLANK 非空白字符串  例： "" -> false, " " -> false, "\r" -> false, "abc" -> true ...
      */
-    public static BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent = IfAbsentEnum.NOT_EMPTY;
+    public static BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent = (val, key) -> IfAbsentEnum.NOT_EMPTY.test(val);
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java
index f04f852..717567e 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java
@@ -1,10 +1,9 @@
 package com.github.yulichang.config.enums;
 
 import com.github.yulichang.toolkit.MPJStringUtils;
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
 
 import java.util.Objects;
-import java.util.function.BiPredicate;
+import java.util.function.Predicate;
 
 /**
  * 条件判断策略
@@ -12,29 +11,29 @@ import java.util.function.BiPredicate;
  * @author yulichang
  * @since 1.4.9
  */
-public enum IfAbsentEnum implements BiPredicate<Object, IfAbsentSqlKeyWordEnum> {
+public enum IfAbsentEnum implements Predicate<Object> {
 
     /**
      * 非null
      */
-    NOT_NULL((val, key) -> Objects.nonNull(val)),
+    NOT_NULL(Objects::nonNull),
     /**
      * 非空字符串   例： "" -> false, " " -> true ...
      */
-    NOT_EMPTY((val, key) -> NOT_NULL.test(val, key) && (!(val instanceof CharSequence) || MPJStringUtils.isNotEmpty((CharSequence) val))),
+    NOT_EMPTY(val -> NOT_NULL.and(v -> !(v instanceof CharSequence) || MPJStringUtils.isNotEmpty((CharSequence) v)).test(val)),
     /**
      * NOT_BLANK 非空白字符串  例： "" -> false, " " -> false, "\r" -> false, "abc" -> true ...
      */
-    NOT_BLANK((val, key) -> NOT_NULL.test(val, key) && (!(val instanceof CharSequence) || MPJStringUtils.isNotBlank((CharSequence) val)));
+    NOT_BLANK(val -> NOT_NULL.and(v -> !(v instanceof CharSequence) || MPJStringUtils.isNotBlank((CharSequence) v)).test(val));
 
-    private final BiPredicate<Object, IfAbsentSqlKeyWordEnum> predicate;
+    private final Predicate<Object> predicate;
 
-    IfAbsentEnum(BiPredicate<Object, IfAbsentSqlKeyWordEnum> predicate) {
+    IfAbsentEnum(Predicate<Object> predicate) {
         this.predicate = predicate;
     }
 
     @Override
-    public boolean test(Object obj, IfAbsentSqlKeyWordEnum keyword) {
-        return this.predicate.test(obj, keyword);
+    public boolean test(Object obj) {
+        return this.predicate.test(obj);
     }
 }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
index 2235568..4b87971 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
@@ -22,17 +22,17 @@ public class IfAbsentTest {
 
     @Test
     void ifAbsent() {
-        assert IfAbsentEnum.NOT_EMPTY.test("\t", null);
-        assert !IfAbsentEnum.NOT_EMPTY.test("", null);
-        assert IfAbsentEnum.NOT_EMPTY.test(" ", null);
-        assert IfAbsentEnum.NOT_EMPTY.test("\r", null);
-        assert IfAbsentEnum.NOT_EMPTY.test("a", null);
+        assert IfAbsentEnum.NOT_EMPTY.test("\t");
+        assert !IfAbsentEnum.NOT_EMPTY.test("");
+        assert IfAbsentEnum.NOT_EMPTY.test(" ");
+        assert IfAbsentEnum.NOT_EMPTY.test("\r");
+        assert IfAbsentEnum.NOT_EMPTY.test("a");
 
-        assert !IfAbsentEnum.NOT_BLANK.test("\t", null);
-        assert !IfAbsentEnum.NOT_BLANK.test("", null);
-        assert !IfAbsentEnum.NOT_BLANK.test(" ", null);
-        assert !IfAbsentEnum.NOT_BLANK.test("\r", null);
-        assert IfAbsentEnum.NOT_BLANK.test("a", null);
+        assert !IfAbsentEnum.NOT_BLANK.test("\t");
+        assert !IfAbsentEnum.NOT_BLANK.test("");
+        assert !IfAbsentEnum.NOT_BLANK.test(" ");
+        assert !IfAbsentEnum.NOT_BLANK.test("\r");
+        assert IfAbsentEnum.NOT_BLANK.test("a");
 
         ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
                 "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +

From ef3301e7eb3b25dad284763a5de0125454bc3013 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 25 Dec 2023 00:57:04 +0800
Subject: [PATCH 45/88] =?UTF-8?q?=E6=B7=BB=E5=8A=A0notLikeLeft=E5=92=8Cnot?=
 =?UTF-8?q?LikeRight?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/kt/KtAbstractWrapper.java       | 10 ++++
 .../yulichang/kt/interfaces/Compare.java      | 47 +++++++++++++++++++
 .../kt/interfaces/CompareIfAbsent.java        | 16 +++++++
 .../yulichang/wrapper/DeleteJoinWrapper.java  |  8 +++-
 ...er.java => JoinAbstractLambdaWrapper.java} | 18 +++----
 ...tWrapper.java => JoinAbstractWrapper.java} | 22 ++++++++-
 .../yulichang/wrapper/MPJLambdaWrapper.java   |  2 +-
 .../yulichang/wrapper/UpdateJoinWrapper.java  |  2 +-
 .../yulichang/wrapper/interfaces/Compare.java | 44 +++++++++++++++++
 .../wrapper/interfaces/CompareIfAbsent.java   | 16 +++++++
 .../wrapper/interfaces/CompareStr.java        | 35 ++++++++++++++
 .../interfaces/CompareStrIfAbsent.java        |  8 ++++
 .../wrapper/interfaces/QueryJoin.java         | 42 ++++++++---------
 .../yulichang/test/join/m/IfAbsentTest.java   |  6 +++
 .../test/join/m/NotLikeLeftRightTest.java     | 40 ++++++++++++++++
 15 files changed, 281 insertions(+), 35 deletions(-)
 rename mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/{MPJAbstractLambdaWrapper.java => JoinAbstractLambdaWrapper.java} (96%)
 rename mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/{MPJAbstractWrapper.java => JoinAbstractWrapper.java} (97%)
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/NotLikeLeftRightTest.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
index 981aec3..cc4211e 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
@@ -252,11 +252,21 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         return likeValue(condition, LIKE, alias, column, val, SqlLike.LEFT);
     }
 
+    @Override
+    public Children notLikeLeft(boolean condition, String alias, KProperty<?> column, Object val) {
+        return likeValue(condition, NOT_LIKE, alias, column, val, SqlLike.LEFT);
+    }
+
     @Override
     public Children likeRight(boolean condition, String alias, KProperty<?> column, Object val) {
         return likeValue(condition, LIKE, alias, column, val, SqlLike.RIGHT);
     }
 
+    @Override
+    public Children notLikeRight(boolean condition, String alias, KProperty<?> column, Object val) {
+        return likeValue(condition, NOT_LIKE, alias, column, val, SqlLike.RIGHT);
+    }
+
     @Override
     public Children between(boolean condition, String alias, KProperty<?> column, Object val1, Object val2) {
         return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), BETWEEN,
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Compare.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Compare.java
index b995c71..4726244 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Compare.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Compare.java
@@ -287,6 +287,28 @@ public interface Compare<Children> extends Serializable {
      */
     Children likeLeft(boolean condition, String alias, KProperty<?> column, Object val);
 
+    default Children notLikeLeft(KProperty<?> column, Object val) {
+        return notLikeLeft(true, null, column, val);
+    }
+
+    default Children notLikeLeft(String alias, KProperty<?> column, Object val) {
+        return notLikeLeft(true, alias, column, val);
+    }
+
+    default Children notLikeLeft(boolean condition, KProperty<?> column, Object val) {
+        return notLikeLeft(condition, null, column, val);
+    }
+
+    /**
+     * LIKE '%值'
+     *
+     * @param condition 执行条件
+     * @param column    字段
+     * @param val       值
+     * @return children
+     */
+    Children notLikeLeft(boolean condition, String alias, KProperty<?> column, Object val);
+
 
     default Children likeRight(KProperty<?> column, Object val) {
         return likeRight(true, null, column, val);
@@ -310,4 +332,29 @@ public interface Compare<Children> extends Serializable {
      * @return children
      */
     Children likeRight(boolean condition, String alias, KProperty<?> column, Object val);
+
+
+
+    default Children notLikeRight(KProperty<?> column, Object val) {
+        return notLikeRight(true, null, column, val);
+    }
+
+    default Children notLikeRight(String alias, KProperty<?> column, Object val) {
+        return notLikeRight(true, alias, column, val);
+    }
+
+    default Children notLikeRight(boolean condition, KProperty<?> column, Object val) {
+        return notLikeRight(condition, null, column, val);
+    }
+
+
+    /**
+     * LIKE '值%'
+     *
+     * @param condition 执行条件
+     * @param column    字段
+     * @param val       值
+     * @return children
+     */
+    Children notLikeRight(boolean condition, String alias, KProperty<?> column, Object val);
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java
index f379a63..71ae0fe 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java
@@ -89,6 +89,14 @@ public interface CompareIfAbsent<Children> extends Compare<Children> {
         return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), alias, column, val);
     }
 
+    default Children notLikeLeftIfAbsent(KProperty<?> column, Object val) {
+        return notLikeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_LEFT), null, column, val);
+    }
+
+    default Children notLikeLeftIfAbsent(String alias, KProperty<?> column, Object val) {
+        return notLikeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_LEFT), alias, column, val);
+    }
+
     default Children likeRightIfAbsent(KProperty<?> column, Object val) {
         return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), null, column, val);
     }
@@ -96,4 +104,12 @@ public interface CompareIfAbsent<Children> extends Compare<Children> {
     default Children likeRightIfAbsent(String alias, KProperty<?> column, Object val) {
         return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), alias, column, val);
     }
+
+    default Children notLikeRightIfAbsent(KProperty<?> column, Object val) {
+        return notLikeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_RIGHT), null, column, val);
+    }
+
+    default Children notLikeRightIfAbsent(String alias, KProperty<?> column, Object val) {
+        return notLikeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_RIGHT), alias, column, val);
+    }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java
index ff4915b..887c7d9 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
  * @author yulichang
  * @since 1.4.5
  */
-public class DeleteJoinWrapper<T> extends MPJAbstractLambdaWrapper<T, DeleteJoinWrapper<T>> {
+public class DeleteJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, DeleteJoinWrapper<T>> {
 
     /**
      * 删除表
@@ -100,6 +100,7 @@ public class DeleteJoinWrapper<T> extends MPJAbstractLambdaWrapper<T, DeleteJoin
      * 获取删除的表
      */
     @Override
+    @SuppressWarnings("DuplicatedCode")
     public String getDeleteLogicSql() {
         if (StringUtils.isNotBlank(this.deleteSql.getStringValue())) {
             return this.deleteSql.getStringValue();
@@ -153,6 +154,7 @@ public class DeleteJoinWrapper<T> extends MPJAbstractLambdaWrapper<T, DeleteJoin
     /**
      * 删除表
      */
+    @SuppressWarnings("DuplicatedCode")
     public DeleteJoinWrapper<T> delete(Class<?>... deleteClass) {
         Class<T> entityClass = getEntityClass();
         Assert.notNull(entityClass, "缺少主表类型, 请使用 new MPJLambdaWrapper<>(主表.class) 或 JoinWrappers.lambda(主表.class) 构造方法");
@@ -164,6 +166,7 @@ public class DeleteJoinWrapper<T> extends MPJAbstractLambdaWrapper<T, DeleteJoin
         return typedThis;
     }
 
+    @SuppressWarnings({"DuplicatedCode", "DataFlowIssue"})
     private void check(List<Class<?>> classList) {
         Class<T> entityClass = getEntityClass();
         TableInfo tableInfo = TableHelper.get(entityClass);
@@ -185,7 +188,8 @@ public class DeleteJoinWrapper<T> extends MPJAbstractLambdaWrapper<T, DeleteJoin
         }
     }
 
-    private void check(){
+    @SuppressWarnings("DuplicatedCode")
+    private void check() {
         if (CollectionUtils.isNotEmpty(tableList.getAll())) {
             Class<T> entityClass = getEntityClass();
             Assert.notNull(entityClass, "缺少主表类型, 请使用 new MPJLambdaWrapper<>(主表.class) 或 JoinWrappers.lambda(主表.class) 构造方法");
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java
similarity index 96%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java
index c0fc4fc..0a2970d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java
@@ -38,8 +38,8 @@ import static java.util.stream.Collectors.joining;
  * @author yulichang
  */
 @SuppressWarnings({"DuplicatedCode", "unused"})
-public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLambdaWrapper<T, Children>>
-        extends MPJAbstractWrapper<T, Children> implements QueryJoin<Children, T> {
+public abstract class JoinAbstractLambdaWrapper<T, Children extends JoinAbstractLambdaWrapper<T, Children>>
+        extends JoinAbstractWrapper<T, Children> implements QueryJoin<Children, T> {
 
     /**
      * 主表别名
@@ -101,14 +101,14 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
     /**
      * 推荐使用 带 class 的构造方法
      */
-    public MPJAbstractLambdaWrapper() {
+    public JoinAbstractLambdaWrapper() {
         initNeed();
     }
 
     /**
      * 推荐使用此构造方法
      */
-    public MPJAbstractLambdaWrapper(Class<T> clazz) {
+    public JoinAbstractLambdaWrapper(Class<T> clazz) {
         initNeed();
         setEntityClass(clazz);
         tableList.setRootClass(clazz);
@@ -119,7 +119,7 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
      *
      * @param entity 主表实体
      */
-    public MPJAbstractLambdaWrapper(T entity) {
+    public JoinAbstractLambdaWrapper(T entity) {
         initNeed();
         setEntity(entity);
         if (entity != null) {
@@ -130,7 +130,7 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
     /**
      * 自定义主表别名
      */
-    public MPJAbstractLambdaWrapper(String alias) {
+    public JoinAbstractLambdaWrapper(String alias) {
         this.alias = alias;
         initNeed();
         tableList.setAlias(alias);
@@ -142,7 +142,7 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
      * @param clazz 主表class类
      * @param alias 主表别名
      */
-    public MPJAbstractLambdaWrapper(Class<T> clazz, String alias) {
+    public JoinAbstractLambdaWrapper(Class<T> clazz, String alias) {
         this.alias = alias;
         setEntityClass(clazz);
         initNeed();
@@ -156,7 +156,7 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
      * @param entity 主表实体类
      * @param alias  主表别名
      */
-    public MPJAbstractLambdaWrapper(T entity, String alias) {
+    public JoinAbstractLambdaWrapper(T entity, String alias) {
         this.alias = alias;
         setEntity(entity);
         initNeed();
@@ -372,7 +372,7 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
      * 内部调用, 不建议使用
      */
     @Override
-    public <R> Children join(String keyWord, Class<R> clazz, String tableAlias, BiConsumer<MPJAbstractLambdaWrapper<T, ?>, Children> consumer) {
+    public <R> Children join(String keyWord, Class<R> clazz, String tableAlias, BiConsumer<JoinAbstractLambdaWrapper<T, ?>, Children> consumer) {
         Integer oldIndex = this.getIndex();
         int newIndex = tableIndex;
         TableInfo info = TableHelper.get(clazz);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractWrapper.java
similarity index 97%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractWrapper.java
index cd22de1..7e97c4d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractWrapper.java
@@ -41,7 +41,7 @@ import static java.util.stream.Collectors.joining;
  * @author yulichang
  */
 @SuppressWarnings({"unchecked", "unused", "DuplicatedCode"})
-public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<T, Children>> extends Wrapper<T>
+public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrapper<T, Children>> extends Wrapper<T>
         implements CompareIfAbsent<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
         CompareStrIfAbsent<Children, String>, FuncStr<Children, String> {
 
@@ -272,11 +272,21 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
         return likeValue(condition, LIKE, alias, column, val, SqlLike.LEFT);
     }
 
+    @Override
+    public <R> Children notLikeLeft(boolean condition, String alias, SFunction<R, ?> column, Object val) {
+        return likeValue(condition, NOT_LIKE, alias, column, val, SqlLike.LEFT);
+    }
+
     @Override
     public <X> Children likeRight(boolean condition, String alias, SFunction<X, ?> column, Object val) {
         return likeValue(condition, LIKE, alias, column, val, SqlLike.RIGHT);
     }
 
+    @Override
+    public <R> Children notLikeRight(boolean condition, String alias, SFunction<R, ?> column, Object val) {
+        return likeValue(condition, NOT_LIKE, alias, column, val, SqlLike.RIGHT);
+    }
+
     @Override
     public <X> Children between(boolean condition, String alias, SFunction<X, ?> column, Object val1, Object val2) {
         return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), BETWEEN,
@@ -1002,11 +1012,21 @@ public abstract class MPJAbstractWrapper<T, Children extends MPJAbstractWrapper<
         return likeValue(condition, LIKE, column, val, SqlLike.LEFT);
     }
 
+    @Override
+    public Children notLikeLeft(boolean condition, String column, Object val) {
+        return likeValue(condition, NOT_LIKE, column, val, SqlLike.LEFT);
+    }
+
     @Override
     public Children likeRight(boolean condition, String column, Object val) {
         return likeValue(condition, LIKE, column, val, SqlLike.RIGHT);
     }
 
+    @Override
+    public Children notLikeRight(boolean condition, String column, Object val) {
+        return likeValue(condition, NOT_LIKE, column, val, SqlLike.RIGHT);
+    }
+
     @Override
     public Children between(boolean condition, String column, Object val1, Object val2) {
         return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), BETWEEN,
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index dcf5c84..488be2e 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
  * @author yulichang
  */
 @SuppressWarnings({"unused", "DuplicatedCode"})
-public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWrapper<T>> implements
+public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaWrapper<T>> implements
         Query<MPJLambdaWrapper<T>>, QueryLabel<MPJLambdaWrapper<T>>, Chain<T>, SelectWrapper<T, MPJLambdaWrapper<T>> {
 
     /**
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
index 84628c3..405385d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
  * @since 1.4.5
  */
 @SuppressWarnings("unused")
-public class UpdateJoinWrapper<T> extends MPJAbstractLambdaWrapper<T, UpdateJoinWrapper<T>>
+public class UpdateJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, UpdateJoinWrapper<T>>
         implements Update<UpdateJoinWrapper<T>> {
     /**
      * SQL 更新字段内容，例如：name='1', age=2
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Compare.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Compare.java
index 7b76b5a..d514904 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Compare.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Compare.java
@@ -305,6 +305,28 @@ public interface Compare<Children> extends Serializable {
      */
     <R> Children likeLeft(boolean condition, String alias, SFunction<R, ?> column, Object val);
 
+    default <R> Children notLikeLeft(SFunction<R, ?> column, Object val) {
+        return notLikeLeft(true, null, column, val);
+    }
+
+    default <R> Children notLikeLeft(String alias, SFunction<R, ?> column, Object val) {
+        return notLikeLeft(true, alias, column, val);
+    }
+
+    default <R> Children notLikeLeft(boolean condition, SFunction<R, ?> column, Object val) {
+        return notLikeLeft(condition, null, column, val);
+    }
+
+    /**
+     * LIKE '%值'
+     *
+     * @param condition 执行条件
+     * @param column    字段
+     * @param val       值
+     * @return children
+     */
+    <R> Children notLikeLeft(boolean condition, String alias, SFunction<R, ?> column, Object val);
+
     default <R> Children likeRight(SFunction<R, ?> column, Object val) {
         return likeRight(true, null, column, val);
     }
@@ -326,4 +348,26 @@ public interface Compare<Children> extends Serializable {
      * @return children
      */
     <R> Children likeRight(boolean condition, String alias, SFunction<R, ?> column, Object val);
+
+    default <R> Children notLikeRight(SFunction<R, ?> column, Object val) {
+        return notLikeRight(true, null, column, val);
+    }
+
+    default <R> Children notLikeRight(String alias, SFunction<R, ?> column, Object val) {
+        return notLikeRight(true, alias, column, val);
+    }
+
+    default <R> Children notLikeRight(boolean condition, SFunction<R, ?> column, Object val) {
+        return notLikeRight(condition, null, column, val);
+    }
+
+    /**
+     * LIKE '值%'
+     *
+     * @param condition 执行条件
+     * @param column    字段
+     * @param val       值
+     * @return children
+     */
+    <R> Children notLikeRight(boolean condition, String alias, SFunction<R, ?> column, Object val);
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java
index 2ac6ca4..51582cc 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java
@@ -88,6 +88,14 @@ public interface CompareIfAbsent<Children> extends Compare<Children> {
         return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), alias, column, val);
     }
 
+    default <R> Children notLikeLeftIfAbsent(SFunction<R, ?> column, Object val) {
+        return notLikeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_LEFT), null, column, val);
+    }
+
+    default <R> Children notLikeLeftIfAbsent(String alias, SFunction<R, ?> column, Object val) {
+        return notLikeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_LEFT), alias, column, val);
+    }
+
     default <R> Children likeRightIfAbsent(SFunction<R, ?> column, Object val) {
         return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), null, column, val);
     }
@@ -95,4 +103,12 @@ public interface CompareIfAbsent<Children> extends Compare<Children> {
     default <R> Children likeRightIfAbsent(String alias, SFunction<R, ?> column, Object val) {
         return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), alias, column, val);
     }
+
+    default <R> Children notLikeRightIfAbsent(SFunction<R, ?> column, Object val) {
+        return notLikeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_RIGHT), null, column, val);
+    }
+
+    default <R> Children notLikeRightIfAbsent(String alias, SFunction<R, ?> column, Object val) {
+        return notLikeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_RIGHT), alias, column, val);
+    }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStr.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStr.java
index c70f917..e428555 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStr.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStr.java
@@ -265,6 +265,23 @@ public interface CompareStr<Children, R> extends Serializable {
      */
     Children likeLeft(boolean condition, R column, Object val);
 
+    /**
+     * ignore
+     */
+    default Children notLikeLeft(R column, Object val) {
+        return notLikeLeft(true, column, val);
+    }
+
+    /**
+     * LIKE '%值'
+     *
+     * @param condition 执行条件
+     * @param column    字段
+     * @param val       值
+     * @return children
+     */
+    Children notLikeLeft(boolean condition, R column, Object val);
+
     /**
      * ignore
      */
@@ -281,4 +298,22 @@ public interface CompareStr<Children, R> extends Serializable {
      * @return children
      */
     Children likeRight(boolean condition, R column, Object val);
+
+
+    /**
+     * ignore
+     */
+    default Children notLikeRight(R column, Object val) {
+        return notLikeRight(true, column, val);
+    }
+
+    /**
+     * LIKE '值%'
+     *
+     * @param condition 执行条件
+     * @param column    字段
+     * @param val       值
+     * @return children
+     */
+    Children notLikeRight(boolean condition, R column, Object val);
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java
index aede362..a58520d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java
@@ -54,4 +54,12 @@ public interface CompareStrIfAbsent<Children, R> extends CompareStr<Children, R>
     default Children likeRightIfAbsent(R column, Object val) {
         return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), column, val);
     }
+
+    default Children notLikeLeftIfAbsent(R column, Object val) {
+        return notLikeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_LEFT), column, val);
+    }
+
+    default Children notLikeRightIfAbsent(R column, Object val) {
+        return notLikeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_RIGHT), column, val);
+    }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/QueryJoin.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/QueryJoin.java
index ddeece3..09bb0ad 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/QueryJoin.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/QueryJoin.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.interfaces.MPJBaseJoin;
 import com.github.yulichang.query.interfaces.StringJoin;
 import com.github.yulichang.toolkit.Constant;
-import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper;
+import com.github.yulichang.wrapper.JoinAbstractLambdaWrapper;
 
 import java.util.function.BiConsumer;
 
@@ -45,7 +45,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
      * @param clazz    关联实体类
      * @param function 条件`
      */
-    default <T> Children leftJoin(Class<T> clazz, WrapperFunction<MPJAbstractLambdaWrapper<Entity, ?>> function) {
+    default <T> Children leftJoin(Class<T> clazz, WrapperFunction<JoinAbstractLambdaWrapper<Entity, ?>> function) {
         return join(Constant.LEFT_JOIN, clazz, function);
     }
 
@@ -68,7 +68,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
      * @param clazz    关联实体类
      * @param consumer 条件
      */
-    default <T> Children leftJoin(Class<T> clazz, BiConsumer<MPJAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
+    default <T> Children leftJoin(Class<T> clazz, BiConsumer<JoinAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
         return join(Constant.LEFT_JOIN, clazz, consumer);
     }
 
@@ -103,7 +103,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
      * @param clazz    关联实体类
      * @param function 条件
      */
-    default <T> Children leftJoin(Class<T> clazz, String alias, WrapperFunction<MPJAbstractLambdaWrapper<Entity, ?>> function) {
+    default <T> Children leftJoin(Class<T> clazz, String alias, WrapperFunction<JoinAbstractLambdaWrapper<Entity, ?>> function) {
         return join(Constant.LEFT_JOIN, clazz, alias, function);
     }
 
@@ -126,7 +126,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
      * @param clazz    关联实体类
      * @param consumer 条件
      */
-    default <T> Children leftJoin(Class<T> clazz, String alias, BiConsumer<MPJAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
+    default <T> Children leftJoin(Class<T> clazz, String alias, BiConsumer<JoinAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
         return join(Constant.LEFT_JOIN, clazz, alias, consumer);
     }
 
@@ -148,7 +148,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T> Children rightJoin(Class<T> clazz, WrapperFunction<MPJAbstractLambdaWrapper<Entity, ?>> function) {
+    default <T> Children rightJoin(Class<T> clazz, WrapperFunction<JoinAbstractLambdaWrapper<Entity, ?>> function) {
         return join(Constant.RIGHT_JOIN, clazz, function);
     }
 
@@ -162,7 +162,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T, X> Children rightJoin(Class<T> clazz, BiConsumer<MPJAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
+    default <T, X> Children rightJoin(Class<T> clazz, BiConsumer<JoinAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
         return join(Constant.RIGHT_JOIN, clazz, consumer);
     }
 
@@ -176,7 +176,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T> Children rightJoin(Class<T> clazz, String alias, WrapperFunction<MPJAbstractLambdaWrapper<Entity, ?>> function) {
+    default <T> Children rightJoin(Class<T> clazz, String alias, WrapperFunction<JoinAbstractLambdaWrapper<Entity, ?>> function) {
         return join(Constant.RIGHT_JOIN, clazz, alias, function);
     }
 
@@ -190,7 +190,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T, X> Children rightJoin(Class<T> clazz, String alias, BiConsumer<MPJAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
+    default <T, X> Children rightJoin(Class<T> clazz, String alias, BiConsumer<JoinAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
         return join(Constant.RIGHT_JOIN, clazz, alias, consumer);
     }
 
@@ -212,7 +212,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T> Children innerJoin(Class<T> clazz, WrapperFunction<MPJAbstractLambdaWrapper<Entity, ?>> function) {
+    default <T> Children innerJoin(Class<T> clazz, WrapperFunction<JoinAbstractLambdaWrapper<Entity, ?>> function) {
         return join(Constant.INNER_JOIN, clazz, function);
     }
 
@@ -226,7 +226,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T> Children innerJoin(Class<T> clazz, BiConsumer<MPJAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
+    default <T> Children innerJoin(Class<T> clazz, BiConsumer<JoinAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
         return join(Constant.INNER_JOIN, clazz, consumer);
     }
 
@@ -241,7 +241,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T> Children innerJoin(Class<T> clazz, String alias, WrapperFunction<MPJAbstractLambdaWrapper<Entity, ?>> function) {
+    default <T> Children innerJoin(Class<T> clazz, String alias, WrapperFunction<JoinAbstractLambdaWrapper<Entity, ?>> function) {
         return join(Constant.INNER_JOIN, clazz, alias, function);
     }
 
@@ -255,7 +255,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T> Children innerJoin(Class<T> clazz, String alias, BiConsumer<MPJAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
+    default <T> Children innerJoin(Class<T> clazz, String alias, BiConsumer<JoinAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
         return join(Constant.INNER_JOIN, clazz, alias, consumer);
     }
 
@@ -276,7 +276,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T> Children fullJoin(Class<T> clazz, WrapperFunction<MPJAbstractLambdaWrapper<Entity, ?>> function) {
+    default <T> Children fullJoin(Class<T> clazz, WrapperFunction<JoinAbstractLambdaWrapper<Entity, ?>> function) {
         return join(Constant.FULL_JOIN, clazz, function);
     }
 
@@ -290,7 +290,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T> Children fullJoin(Class<T> clazz, BiConsumer<MPJAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
+    default <T> Children fullJoin(Class<T> clazz, BiConsumer<JoinAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
         return join(Constant.FULL_JOIN, clazz, consumer);
     }
 
@@ -311,7 +311,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T> Children fullJoin(Class<T> clazz, String alias, WrapperFunction<MPJAbstractLambdaWrapper<Entity, ?>> function) {
+    default <T> Children fullJoin(Class<T> clazz, String alias, WrapperFunction<JoinAbstractLambdaWrapper<Entity, ?>> function) {
         return join(Constant.FULL_JOIN, clazz, alias, function);
     }
 
@@ -325,7 +325,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * ignore 参考 left join
      */
-    default <T> Children fullJoin(Class<T> clazz, String alias, BiConsumer<MPJAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
+    default <T> Children fullJoin(Class<T> clazz, String alias, BiConsumer<JoinAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
         return join(Constant.FULL_JOIN, clazz, alias, consumer);
     }
 
@@ -366,7 +366,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
      * @param clazz    关联实体类
      * @param function 条件
      */
-    default <T> Children join(String keyWord, Class<T> clazz, WrapperFunction<MPJAbstractLambdaWrapper<Entity, ?>> function) {
+    default <T> Children join(String keyWord, Class<T> clazz, WrapperFunction<JoinAbstractLambdaWrapper<Entity, ?>> function) {
         return join(keyWord, clazz, (on, e) -> function.apply(on));
     }
 
@@ -422,7 +422,7 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
      * @param clazz    关联实体类
      * @param function 条件
      */
-    default <T> Children join(String keyWord, Class<T> clazz, String alias, WrapperFunction<MPJAbstractLambdaWrapper<Entity, ?>> function) {
+    default <T> Children join(String keyWord, Class<T> clazz, String alias, WrapperFunction<JoinAbstractLambdaWrapper<Entity, ?>> function) {
         return join(keyWord, clazz, alias, (on, e) -> function.apply(on));
     }
 
@@ -443,12 +443,12 @@ public interface QueryJoin<Children, Entity> extends MPJBaseJoin<Entity>, String
     /**
      * 内部使用, 不建议直接调用
      */
-    default <T> Children join(String keyWord, Class<T> clazz, BiConsumer<MPJAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
+    default <T> Children join(String keyWord, Class<T> clazz, BiConsumer<JoinAbstractLambdaWrapper<Entity, ?>, Children> consumer) {
         return join(keyWord, clazz, null, consumer);
     }
 
     /**
      * 内部使用, 不建议直接调用
      */
-    <T> Children join(String keyWord, Class<T> clazz, String alias, BiConsumer<MPJAbstractLambdaWrapper<Entity, ?>, Children> consumer);
+    <T> Children join(String keyWord, Class<T> clazz, String alias, BiConsumer<JoinAbstractLambdaWrapper<Entity, ?>, Children> consumer);
 }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
index 4b87971..f12eedd 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
@@ -27,12 +27,18 @@ public class IfAbsentTest {
         assert IfAbsentEnum.NOT_EMPTY.test(" ");
         assert IfAbsentEnum.NOT_EMPTY.test("\r");
         assert IfAbsentEnum.NOT_EMPTY.test("a");
+        assert IfAbsentEnum.NOT_EMPTY.test(1);
+        assert IfAbsentEnum.NOT_EMPTY.test(true);
+        assert IfAbsentEnum.NOT_EMPTY.test('A');
 
         assert !IfAbsentEnum.NOT_BLANK.test("\t");
         assert !IfAbsentEnum.NOT_BLANK.test("");
         assert !IfAbsentEnum.NOT_BLANK.test(" ");
         assert !IfAbsentEnum.NOT_BLANK.test("\r");
         assert IfAbsentEnum.NOT_BLANK.test("a");
+        assert IfAbsentEnum.NOT_EMPTY.test(1);
+        assert IfAbsentEnum.NOT_EMPTY.test(true);
+        assert IfAbsentEnum.NOT_EMPTY.test('A');
 
         ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
                 "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/NotLikeLeftRightTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/NotLikeLeftRightTest.java
new file mode 100644
index 0000000..a396366
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/NotLikeLeftRightTest.java
@@ -0,0 +1,40 @@
+package com.github.yulichang.test.join.m;
+
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+@SpringBootTest
+public class NotLikeLeftRightTest {
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+    @Test
+    void notLikeLeftRight() {
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
+                "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.`name` NOT LIKE ?)");
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .notLikeLeft(UserDO::getName, "aa");
+        List<UserDO> list = wrapper.list();
+        list.forEach(System.out::println);
+
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
+                "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.`name` NOT LIKE ?)");
+        MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .notLikeRight(UserDO::getName, "aa");
+        List<UserDO> list1 = wrapper1.list();
+        list1.forEach(System.out::println);
+    }
+}

From 6a6b6415efb4d514be509bad21f55945a1373833 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 25 Dec 2023 23:38:24 +0800
Subject: [PATCH 46/88] MP -> 3.5.5

---
 mybatis-plus-join-test/pom.xml | 2 +-
 pom.xml                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index 251c30b..fd5218d 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -51,7 +51,7 @@
 
     <properties>
         <revision>1.4.8.1</revision>
-        <mpj.mybatis.plus.version>3.5.4.1</mpj.mybatis.plus.version>
+        <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>
diff --git a/pom.xml b/pom.xml
index b7d4d51..e54380e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
 
     <properties>
         <revision>1.4.8.1</revision>
-        <mpj.mybatis.plus.version>3.5.4.1</mpj.mybatis.plus.version>
+        <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>

From 3d3762f47009eabd136f180c8b0096cc93812c6c Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 25 Dec 2023 23:52:50 +0800
Subject: [PATCH 47/88] MP -> 3.5.5

---
 .../com/github/yulichang/kt/KtAbstractWrapper.java     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
index cc4211e..ca03000 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
@@ -898,11 +898,21 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         return likeValue(condition, LIKE, column, val, SqlLike.LEFT);
     }
 
+    @Override
+    public Children notLikeLeft(boolean condition, String column, Object val) {
+        return likeValue(condition, NOT_LIKE, column, val, SqlLike.LEFT);
+    }
+
     @Override
     public Children likeRight(boolean condition, String column, Object val) {
         return likeValue(condition, LIKE, column, val, SqlLike.RIGHT);
     }
 
+    @Override
+    public Children notLikeRight(boolean condition, String column, Object val) {
+        return likeValue(condition, NOT_LIKE, column, val, SqlLike.RIGHT);
+    }
+
     @Override
     public Children between(boolean condition, String column, Object val1, Object val2) {
         return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), BETWEEN,

From dbdea7b592af5015d26838a79c2c7d74c149695d Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 27 Dec 2023 14:55:56 +0800
Subject: [PATCH 48/88] fix
 https://gitee.com/best_handsome/mybatis-plus-join/issues/I8RE0R

---
 .../yulichang/interceptor/MPJInterceptor.java | 12 +---
 mybatis-plus-join-test/pom.xml                | 30 ++++++++++
 .../test/join/LambdaWrapperTest.java          |  6 +-
 .../yulichang/test/join/m/FieldAliasTest.java | 59 +++++++++++++++++++
 4 files changed, 96 insertions(+), 11 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/FieldAliasTest.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
index 3d7bf01..0eea4f3 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.interfaces.MPJBaseJoin;
-import com.github.yulichang.method.MPJResultType;
 import com.github.yulichang.query.MPJQueryWrapper;
 import com.github.yulichang.toolkit.Constant;
 import com.github.yulichang.toolkit.MPJReflectionKit;
@@ -77,19 +76,14 @@ public class MPJInterceptor implements Interceptor {
                             if (CollectionUtils.isNotEmpty(ms.getResultMaps())) {
                                 Class<?> entity = MPJTableMapperHelper.getEntity(getMapper(ms.getId(), ms.getResource()));
                                 Class<?> type = ms.getResultMaps().get(0).getType();
-                                if (Objects.nonNull(entity) && Objects.nonNull(type) && entity == type) {
+                                if (Objects.nonNull(entity) && Objects.nonNull(type)
+                                        && !MPJReflectionKit.isPrimitiveOrWrapper(type) && entity == type) {
                                     rt = type;
                                 }
                             }
                         }
                         if (Objects.nonNull(rt)) {
-                            List<ResultMap> list = ms.getResultMaps();
-                            if (CollectionUtils.isNotEmpty(list)) {
-                                ResultMap resultMap = list.get(0);
-                                if (resultMap.getType() == MPJResultType.class) {
-                                    args[0] = getMappedStatement(ms, rt, ew);
-                                }
-                            }
+                            args[0] = getMappedStatement(ms, rt, ew);
                         }
                     }
                 }
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index fd5218d..7506d26 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -104,4 +104,34 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <configuration>
+                    <!-- 是否更新pom文件，此处还有更高级的用法 -->
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index c6cbb4e..4cc9630 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -260,7 +260,6 @@ class LambdaWrapperTest {
 
 
     @Test
-    @SuppressWarnings("unchecked")
     void testMSCache() {
         ThreadLocalUtils.set("SELECT t.id,\n" +
                 "       t.pid,\n" +
@@ -738,7 +737,9 @@ class LambdaWrapperTest {
                 .lt(UserDO::getId, 8));
         assert dos.size() == 4;
 
-        ThreadLocalUtils.set("SELECT id,pid,`name`,`json`,sex,head_img,create_time,address_id,address_id2,del,create_by,update_by FROM `user` t WHERE t.del=false AND (t.id > ? AND t.id < ?)",
+        ThreadLocalUtils.set(
+                "SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.id > ? AND t.id < ?)",
+                "SELECT id, pid, `name`, `json`, sex, head_img, create_time, address_id, address_id2, del, create_by, update_by FROM `user` t WHERE t.del = false AND (t.id > ? AND t.id < ?)",
                 "SELECT * FROM `user` t WHERE t.del=false AND (t.id > ? AND t.id < ?) ");
         List<UserDO> dos1 = userMapper.selectList(new MPJLambdaWrapper<UserDO>()
                 .gt(UserDO::getId, 3)
@@ -993,6 +994,7 @@ class LambdaWrapperTest {
     void joinOrder() {
         if (VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.4.3") >= 0) {
             ThreadLocalUtils.set("SELECT id,user_id,name FROM order_t t ORDER BY t.name DESC",
+                    "SELECT t.id, t.user_id, t.name FROM order_t t ORDER BY t.name DESC",
                     "SELECT id,user_id,name FROM order_t t ORDER BY t.name desc");
         } else {
             ThreadLocalUtils.set("SELECT id,user_id,name FROM order_t t",
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/FieldAliasTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/FieldAliasTest.java
new file mode 100644
index 0000000..515f366
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/FieldAliasTest.java
@@ -0,0 +1,59 @@
+package com.github.yulichang.test.join.m;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.yulichang.test.join.entity.AddressDO;
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.join.entity.UserTenantDO;
+import com.github.yulichang.test.join.mapper.UserMapper;
+import com.github.yulichang.test.join.mapper.UserTenantMapper;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+@SpringBootTest
+public class FieldAliasTest {
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @Autowired
+    private UserTenantMapper userTenantMapper;
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+
+    @Test
+    void fieldAlias() {
+        List<UserDO> list = userMapper.selectList(JoinWrappers.lambda(UserDO.class)
+                .selectAll(UserDO.class)
+                .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId));
+
+        list.forEach(System.out::println);
+
+        assert list.get(0).getImg() != null;
+
+    }
+
+    @Test
+    void fieldAlias1() {
+        MPJLambdaWrapper<UserTenantDO> wrapper = JoinWrappers.lambda(UserTenantDO.class)
+                .selectAll(UserTenantDO.class)
+                .leftJoin(UserDO.class, UserDO::getId, UserTenantDO::getUuid);
+        List<UserTenantDO> list = userTenantMapper.selectList(wrapper);
+
+        new LambdaQueryWrapper<UserDO>().getSqlSelect();
+        list.forEach(System.out::println);
+        System.out.println(wrapper.getSqlSelect());
+        assert list.get(0).getIdea() != null;
+        assert list.get(0).getUuid() != null;
+    }
+}

From 63e5c3787ef79b1c2aa55283ae4c47cb36c1ad22 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 29 Dec 2023 21:33:36 +0800
Subject: [PATCH 49/88] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autoconfigure/MybatisPlusJoinAutoConfiguration.java       | 4 ++--
 ...qlInjectorCondition.java => JoinSqlInjectorCondition.java} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/conditional/{MPJSqlInjectorCondition.java => JoinSqlInjectorCondition.java} (88%)

diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
index 3d8a6e5..0a51a03 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
@@ -2,7 +2,7 @@ package com.github.yulichang.autoconfigure;
 
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusLanguageDriverAutoConfiguration;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
-import com.github.yulichang.autoconfigure.conditional.MPJSqlInjectorCondition;
+import com.github.yulichang.autoconfigure.conditional.JoinSqlInjectorCondition;
 import com.github.yulichang.autoconfigure.consumer.MybatisPlusJoinIfAbsentConsumer;
 import com.github.yulichang.autoconfigure.consumer.MybatisPlusJoinPropertiesConsumer;
 import com.github.yulichang.config.ConfigProperties;
@@ -102,7 +102,7 @@ public class MybatisPlusJoinAutoConfiguration {
      */
     @Bean
     @Primary
-    @MPJSqlInjectorCondition
+    @JoinSqlInjectorCondition
     @Order(Ordered.HIGHEST_PRECEDENCE)
     @ConditionalOnBean(ISqlInjector.class)
     @ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class})
diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/conditional/MPJSqlInjectorCondition.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/conditional/JoinSqlInjectorCondition.java
similarity index 88%
rename from mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/conditional/MPJSqlInjectorCondition.java
rename to mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/conditional/JoinSqlInjectorCondition.java
index ac24fec..20d3987 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/conditional/MPJSqlInjectorCondition.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/conditional/JoinSqlInjectorCondition.java
@@ -13,5 +13,5 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Conditional(OnSqlInjectorCondition.class)
-public @interface MPJSqlInjectorCondition {
+public @interface JoinSqlInjectorCondition {
 }

From e021c8281bc1cd5a71bf80ded4507d141880ca68 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sat, 30 Dec 2023 14:30:37 +0800
Subject: [PATCH 50/88] solon-plugin

---
 mybatis-plus-join-solon-plugin/pom.xml        | 53 +++++++++++
 .../solon/plugin/XPluginImpl.java             | 91 +++++++++++++++++++
 .../mybatis-plus-join-solon-plugin.properties |  3 +
 pom.xml                                       |  1 +
 4 files changed, 148 insertions(+)
 create mode 100644 mybatis-plus-join-solon-plugin/pom.xml
 create mode 100644 mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
 create mode 100644 mybatis-plus-join-solon-plugin/src/main/resources/META-INF/solon/mybatis-plus-join-solon-plugin.properties

diff --git a/mybatis-plus-join-solon-plugin/pom.xml b/mybatis-plus-join-solon-plugin/pom.xml
new file mode 100644
index 0000000..5fd1732
--- /dev/null
+++ b/mybatis-plus-join-solon-plugin/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.yulichang</groupId>
+        <artifactId>mybatis-plus-join-root</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>mybatis-plus-join-solon-plugin</artifactId>
+
+    <properties>
+        <solon.varrsion>2.6.3</solon.varrsion>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-extension</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
+            <version>${mpj.mybatis.plus.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon</artifactId>
+            <version>${solon.varrsion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>mybatis-solon-plugin</artifactId>
+            <version>${solon.varrsion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>mybatis-plus-solon-plugin</artifactId>
+            <version>${solon.varrsion}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
new file mode 100644
index 0000000..b6ab44f
--- /dev/null
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
@@ -0,0 +1,91 @@
+package com.github.yulichang.mybatisplusjoin.solon.plugin;
+
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
+import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
+import com.github.yulichang.config.ConfigProperties;
+import com.github.yulichang.config.MPJInterceptorConfig;
+import com.github.yulichang.config.enums.IfAbsentEnum;
+import com.github.yulichang.config.enums.LogicDelTypeEnum;
+import com.github.yulichang.extension.mapping.config.MappingConfig;
+import com.github.yulichang.injector.MPJSqlInjector;
+import com.github.yulichang.toolkit.SpringContentUtils;
+import com.github.yulichang.toolkit.reflect.GenericTypeUtils;
+import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.solon.MybatisAdapter;
+import org.apache.ibatis.solon.integration.MybatisAdapterManager;
+import org.noear.solon.core.AppContext;
+import org.noear.solon.core.Plugin;
+import org.noear.solon.core.Props;
+import org.noear.solon.core.event.AppLoadEndEvent;
+import org.noear.solon.core.util.GenericUtil;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.BiPredicate;
+import java.util.stream.Collectors;
+
+public class XPluginImpl implements Plugin {
+
+    @Override
+    public void start(AppContext context) throws Throwable {
+        /* 设置 MPJSqlInjector
+        反射修改GlobalConfigUtils.GLOBAL_CONFIG属性
+        修改final修饰的变量会出现警告
+        使用solon方式配置不生效采用的“曲线救国”方式
+        issue https://gitee.com/noear/solon/issues/I8SJ0Z */
+        Field field = GlobalConfigUtils.class.getDeclaredField("GLOBAL_CONFIG");
+        field.setAccessible(true);
+        Field modifier = Field.class.getDeclaredField("modifiers");
+        modifier.setAccessible(true);
+        modifier.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+        field.set(null, new ConcurrentHashMap<String, GlobalConfig>() {
+            @Override
+            @SuppressWarnings("NullableProblems")
+            public GlobalConfig putIfAbsent(String key, GlobalConfig value) {
+                value.setSqlInjector(new MPJSqlInjector());
+                return super.putIfAbsent(key, value);
+            }
+        });
+        GenericTypeUtils.setGenericTypeResolver(GenericUtil::resolveTypeArguments);
+        // SpringContext兼容
+        SpringContentUtils.setSpringContext(new SpringContentUtils.SpringContext() {
+            @Override
+            public <T> T getBean(Class<T> clazz) {
+                return context.getBean(clazz);
+            }
+
+            @Override
+            public <T> Map<String, T> getBeansOfType(Class<T> clazz) {
+                return context.getBeansMapOfType(clazz);
+            }
+        });
+        // 读取配置
+        Props prop = context.cfg().getProp("mybatis-plus-join");
+        ConfigProperties.banner = prop.getBool("banner", ConfigProperties.banner);
+        ConfigProperties.subTableLogic = prop.getBool("subTableLogic", ConfigProperties.subTableLogic);
+        ConfigProperties.msCache = prop.getBool("msCache", ConfigProperties.msCache);
+        ConfigProperties.tableAlias = prop.get("tableAlias", ConfigProperties.tableAlias);
+        ConfigProperties.joinPrefix = prop.get("joinPrefix", ConfigProperties.joinPrefix);
+        ConfigProperties.logicDelType = prop.getOrDefault("logicDelType", ConfigProperties.logicDelType, val ->
+                Arrays.stream(LogicDelTypeEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()
+                        .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.logicDelType 配置错误")));
+        ConfigProperties.mappingMaxCount = prop.getInt("mappingMaxCount", ConfigProperties.mappingMaxCount);
+        ConfigProperties.ifAbsent = prop.getOrDefault("ifAbsent", ConfigProperties.ifAbsent, val ->
+                Arrays.stream(IfAbsentEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()
+                        .map(m -> (BiPredicate<Object, IfAbsentSqlKeyWordEnum>) (o, ifAbsentSqlKeyWordEnum) -> m.test(o))
+                        .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.ifAbsent 配置错误")));
+        // 后续操作
+        context.onEvent(AppLoadEndEvent.class, e -> {
+            List<SqlSessionFactory> sqlSessionFactoryList = MybatisAdapterManager.getAll().values().stream()
+                    .map(MybatisAdapter::getFactory).collect(Collectors.toList());
+            new MPJInterceptorConfig(sqlSessionFactoryList, false);
+            MappingConfig.init();
+        });
+    }
+}
\ No newline at end of file
diff --git a/mybatis-plus-join-solon-plugin/src/main/resources/META-INF/solon/mybatis-plus-join-solon-plugin.properties b/mybatis-plus-join-solon-plugin/src/main/resources/META-INF/solon/mybatis-plus-join-solon-plugin.properties
new file mode 100644
index 0000000..ce4223a
--- /dev/null
+++ b/mybatis-plus-join-solon-plugin/src/main/resources/META-INF/solon/mybatis-plus-join-solon-plugin.properties
@@ -0,0 +1,3 @@
+# suppress inspection "UnusedProperty" for whole file
+solon.plugin=com.github.yulichang.mybatisplusjoin.solon.plugin.XPluginImpl
+solon.plugin.priority=3
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e54380e..4808b33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
         <module>mybatis-plus-join-core</module>
         <module>mybatis-plus-join-annotation</module>
         <module>mybatis-plus-join-extension</module>
+        <module>mybatis-plus-join-solon-plugin</module>
         <module>mybatis-plus-join-test</module>
     </modules>
 

From 75fc373f2cc848bbeb0d226c14c087d0ff7f1523 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sat, 30 Dec 2023 14:52:32 +0800
Subject: [PATCH 51/88] solon-plugin

---
 mybatis-plus-join-solon-plugin/README.md                 | 9 +++++++++
 .../mybatisplusjoin/solon/plugin/XPluginImpl.java        | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 mybatis-plus-join-solon-plugin/README.md

diff --git a/mybatis-plus-join-solon-plugin/README.md b/mybatis-plus-join-solon-plugin/README.md
new file mode 100644
index 0000000..6f8e809
--- /dev/null
+++ b/mybatis-plus-join-solon-plugin/README.md
@@ -0,0 +1,9 @@
+## mybatis-plus-join-solon-plugin
+
+```xml
+<dependency>
+    <groupId>com.github.yulichang</groupId>
+    <artifactId>mybatis-plus-join-solon-plugin</artifactId>
+    <version>lastVersion</version>
+</dependency>
+```
\ No newline at end of file
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
index b6ab44f..9ad963e 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
@@ -84,7 +84,7 @@ public class XPluginImpl implements Plugin {
         context.onEvent(AppLoadEndEvent.class, e -> {
             List<SqlSessionFactory> sqlSessionFactoryList = MybatisAdapterManager.getAll().values().stream()
                     .map(MybatisAdapter::getFactory).collect(Collectors.toList());
-            new MPJInterceptorConfig(sqlSessionFactoryList, false);
+            new MPJInterceptorConfig(sqlSessionFactoryList, ConfigProperties.banner);
             MappingConfig.init();
         });
     }

From f038a10e1e75d121458f8fbda799c6ccd56f1490 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sat, 30 Dec 2023 15:03:55 +0800
Subject: [PATCH 52/88] 1.4.9

---
 README-zh.md                                                  | 4 ++--
 README.md                                                     | 4 ++--
 .../com/github/yulichang/config/MPJInterceptorConfig.java     | 2 +-
 mybatis-plus-join-test/pom.xml                                | 2 +-
 mybatis-plus-join/pom.xml                                     | 2 +-
 pom.xml                                                       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index 88e80fe..3d4d970 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -49,12 +49,12 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.8.1</version>
+      <version>1.4.9</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.8.1'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.9'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/README.md b/README.md
index d44ae08..d9dba93 100644
--- a/README.md
+++ b/README.md
@@ -47,12 +47,12 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.8.1</version>
+      <version>1.4.9</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.8.1'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.9'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
index b47a29d..ccef440 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
@@ -30,7 +30,7 @@ public class MPJInterceptorConfig {
             System.out.println(" _ _   |_  _ _|_. ___ _ |    _  .  _  .  _  \n" +
                     "| | |\\/|_)(_| | |_\\  |_)||_|_\\  | (_) | | | \n" +
                     "     /               |          /\n" +
-                    "                                    1.4.8.1");
+                    "                                    1.4.9");
         }
     }
 
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index 7506d26..8ee3b2a 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -50,7 +50,7 @@
     </scm>
 
     <properties>
-        <revision>1.4.8.1</revision>
+        <revision>1.4.9</revision>
         <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>
diff --git a/mybatis-plus-join/pom.xml b/mybatis-plus-join/pom.xml
index 6bcab65..5486ac5 100644
--- a/mybatis-plus-join/pom.xml
+++ b/mybatis-plus-join/pom.xml
@@ -41,7 +41,7 @@
     </scm>
 
     <properties>
-        <revision>1.4.8.1</revision>
+        <revision>1.4.9</revision>
 
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>
diff --git a/pom.xml b/pom.xml
index 4808b33..9a9b697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
     </modules>
 
     <properties>
-        <revision>1.4.8.1</revision>
+        <revision>1.4.9</revision>
         <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>

From aee5f54559f17c9e8bec5706bfb23fe8de4e4354 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sun, 31 Dec 2023 11:49:50 +0800
Subject: [PATCH 53/88] solon

---
 .../solon/plugin/XPluginImpl.java             | 31 +++++--------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
index 9ad963e..f87d660 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
@@ -1,8 +1,6 @@
 package com.github.yulichang.mybatisplusjoin.solon.plugin;
 
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
-import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.config.MPJInterceptorConfig;
 import com.github.yulichang.config.enums.IfAbsentEnum;
@@ -15,43 +13,28 @@ import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.solon.MybatisAdapter;
 import org.apache.ibatis.solon.integration.MybatisAdapterManager;
+import org.noear.solon.Utils;
 import org.noear.solon.core.AppContext;
 import org.noear.solon.core.Plugin;
 import org.noear.solon.core.Props;
 import org.noear.solon.core.event.AppLoadEndEvent;
 import org.noear.solon.core.util.GenericUtil;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
+import javax.sql.DataSource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiPredicate;
 import java.util.stream.Collectors;
 
 public class XPluginImpl implements Plugin {
 
     @Override
-    public void start(AppContext context) throws Throwable {
-        /* 设置 MPJSqlInjector
-        反射修改GlobalConfigUtils.GLOBAL_CONFIG属性
-        修改final修饰的变量会出现警告
-        使用solon方式配置不生效采用的“曲线救国”方式
-        issue https://gitee.com/noear/solon/issues/I8SJ0Z */
-        Field field = GlobalConfigUtils.class.getDeclaredField("GLOBAL_CONFIG");
-        field.setAccessible(true);
-        Field modifier = Field.class.getDeclaredField("modifiers");
-        modifier.setAccessible(true);
-        modifier.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-        field.set(null, new ConcurrentHashMap<String, GlobalConfig>() {
-            @Override
-            @SuppressWarnings("NullableProblems")
-            public GlobalConfig putIfAbsent(String key, GlobalConfig value) {
-                value.setSqlInjector(new MPJSqlInjector());
-                return super.putIfAbsent(key, value);
-            }
-        });
+    public void start(AppContext context) {
+        // MPJSqlInjector
+        context.subWrapsOfType(DataSource.class, bw -> context.cfg().putIfAbsent(Utils.isEmpty(bw.name()) ?
+                "mybatis.globalConfig.sqlInjector" : ("mybatis." + bw.name() + ".globalConfig.sqlInjector"), MPJSqlInjector.class.getName()));
+        // setGenericTypeResolver
         GenericTypeUtils.setGenericTypeResolver(GenericUtil::resolveTypeArguments);
         // SpringContext兼容
         SpringContentUtils.setSpringContext(new SpringContentUtils.SpringContext() {

From 26d7ff580b27a07675709e387e6e07c9c1d79c80 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 5 Jan 2024 11:17:12 +0800
Subject: [PATCH 54/88] solon

---
 .../solon/plugin/XPluginImpl.java             | 50 +++++++++++++------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
index f87d660..d6fad17 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
@@ -21,10 +21,9 @@ import org.noear.solon.core.event.AppLoadEndEvent;
 import org.noear.solon.core.util.GenericUtil;
 
 import javax.sql.DataSource;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.BiPredicate;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public class XPluginImpl implements Plugin {
@@ -33,7 +32,8 @@ public class XPluginImpl implements Plugin {
     public void start(AppContext context) {
         // MPJSqlInjector
         context.subWrapsOfType(DataSource.class, bw -> context.cfg().putIfAbsent(Utils.isEmpty(bw.name()) ?
-                "mybatis.globalConfig.sqlInjector" : ("mybatis." + bw.name() + ".globalConfig.sqlInjector"), MPJSqlInjector.class.getName()));
+                        "mybatis.globalConfig.sqlInjector" : ("mybatis." + bw.name() + ".globalConfig.sqlInjector"),
+                MPJSqlInjector.class.getName()));
         // setGenericTypeResolver
         GenericTypeUtils.setGenericTypeResolver(GenericUtil::resolveTypeArguments);
         // SpringContext兼容
@@ -49,19 +49,19 @@ public class XPluginImpl implements Plugin {
             }
         });
         // 读取配置
-        Props prop = context.cfg().getProp("mybatis-plus-join");
-        ConfigProperties.banner = prop.getBool("banner", ConfigProperties.banner);
-        ConfigProperties.subTableLogic = prop.getBool("subTableLogic", ConfigProperties.subTableLogic);
-        ConfigProperties.msCache = prop.getBool("msCache", ConfigProperties.msCache);
-        ConfigProperties.tableAlias = prop.get("tableAlias", ConfigProperties.tableAlias);
-        ConfigProperties.joinPrefix = prop.get("joinPrefix", ConfigProperties.joinPrefix);
-        ConfigProperties.logicDelType = prop.getOrDefault("logicDelType", ConfigProperties.logicDelType, val ->
+        Prop prop = new Prop(context.cfg().getProp("mybatis-plus-join"));
+        ConfigProperties.banner = prop.get("banner", Boolean::parseBoolean);
+        ConfigProperties.subTableLogic = prop.get("subTableLogic", Boolean::parseBoolean);
+        ConfigProperties.msCache = prop.get("msCache", Boolean::parseBoolean);
+        ConfigProperties.tableAlias = prop.get("tableAlias", Function.identity());
+        ConfigProperties.joinPrefix = prop.get("joinPrefix", Function.identity());
+        ConfigProperties.logicDelType = prop.get("logicDelType", val ->
                 Arrays.stream(LogicDelTypeEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()
                         .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.logicDelType 配置错误")));
-        ConfigProperties.mappingMaxCount = prop.getInt("mappingMaxCount", ConfigProperties.mappingMaxCount);
-        ConfigProperties.ifAbsent = prop.getOrDefault("ifAbsent", ConfigProperties.ifAbsent, val ->
+        ConfigProperties.mappingMaxCount = prop.get("mappingMaxCount", Integer::parseInt);
+        ConfigProperties.ifAbsent = prop.get("ifAbsent", val ->
                 Arrays.stream(IfAbsentEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()
-                        .map(m -> (BiPredicate<Object, IfAbsentSqlKeyWordEnum>) (o, ifAbsentSqlKeyWordEnum) -> m.test(o))
+                        .map(m -> (BiPredicate<Object, IfAbsentSqlKeyWordEnum>) (o, enums) -> m.test(o))
                         .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.ifAbsent 配置错误")));
         // 后续操作
         context.onEvent(AppLoadEndEvent.class, e -> {
@@ -71,4 +71,26 @@ public class XPluginImpl implements Plugin {
             MappingConfig.init();
         });
     }
+
+    private static class Prop {
+
+        private final Properties props;
+
+        public Prop(Props props) {
+            this.props = new Properties();
+            props.forEach((k, v) -> this.props.put(k.toString()
+                    .replaceAll("[-_]", "").toUpperCase(Locale.ENGLISH), v));
+        }
+
+        @SuppressWarnings("unchecked")
+        public <T> T get(String key, Function<String, T> convert) {
+            try {
+                return Optional.ofNullable(this.props.get(key.toUpperCase(Locale.ENGLISH)))
+                        .map(v -> convert.apply(v.toString()))
+                        .orElse((T) ConfigProperties.class.getDeclaredField(key).get(null));
+            } catch (IllegalAccessException | NoSuchFieldException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
 }
\ No newline at end of file

From 8a347e4a23ff9657c736cf2a306b5d8e44d46e06 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 5 Jan 2024 11:57:07 +0800
Subject: [PATCH 55/88] ifPresent

---
 .../MybatisPlusJoinAutoConfiguration.java     |  12 +-
 .../MybatisPlusJoinProperties.java            |   6 +-
 .../MybatisPlusJoinIfAbsentConsumer.java      |  14 --
 .../MybatisPlusJoinIfPresentConsumer.java     |  14 ++
 ...itional-spring-configuration-metadata.json |   8 +-
 .../yulichang/config/ConfigProperties.java    |   8 +-
 .../{IfAbsentEnum.java => IfPresentEnum.java} |   4 +-
 .../yulichang/kt/KtAbstractWrapper.java       |  24 +--
 .../kt/interfaces/CompareIfAbsent.java        | 115 -------------
 .../kt/interfaces/CompareIfPresent.java       | 115 +++++++++++++
 .../query/MPJLambdaQueryWrapper.java          |  26 +--
 .../yulichang/query/MPJQueryWrapper.java      |  26 +--
 .../query/interfaces/CompareIfAbsent.java     | 151 ------------------
 .../query/interfaces/CompareIfPresent.java    | 151 ++++++++++++++++++
 .../wrapper/JoinAbstractWrapper.java          |  26 +--
 .../yulichang/wrapper/MPJLambdaWrapper.java   |  12 +-
 ...Enum.java => IfPresentSqlKeyWordEnum.java} |   2 +-
 .../wrapper/interfaces/CompareIfAbsent.java   | 114 -------------
 .../wrapper/interfaces/CompareIfPresent.java  | 114 +++++++++++++
 .../interfaces/CompareStrIfAbsent.java        |  65 --------
 .../interfaces/CompareStrIfPresent.java       |  65 ++++++++
 .../solon/plugin/XPluginImpl.java             |  12 +-
 .../test/join/m/CustomWrapperTest.java        |   7 +-
 .../{IfAbsentTest.java => IfPresentTest.java} |  72 ++++-----
 .../github/yulichang/test/kt/entity/UserDO.kt |   3 +
 .../yulichang/test/kt/LambdaWrapperTest.kt    |   4 +-
 .../yulichang/test/kt/m/CustomWrapperTest.kt  |  14 +-
 .../src/main/resources/application.yml        |   3 +-
 28 files changed, 596 insertions(+), 591 deletions(-)
 delete mode 100644 mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfAbsentConsumer.java
 create mode 100644 mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfPresentConsumer.java
 rename mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/{IfAbsentEnum.java => IfPresentEnum.java} (89%)
 delete mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfPresent.java
 delete mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfAbsent.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfPresent.java
 rename mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/{IfAbsentSqlKeyWordEnum.java => IfPresentSqlKeyWordEnum.java} (87%)
 delete mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfPresent.java
 delete mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfPresent.java
 rename mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/{IfAbsentTest.java => IfPresentTest.java} (53%)

diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
index 0a51a03..66bf5c0 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
@@ -3,7 +3,7 @@ package com.github.yulichang.autoconfigure;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusLanguageDriverAutoConfiguration;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
 import com.github.yulichang.autoconfigure.conditional.JoinSqlInjectorCondition;
-import com.github.yulichang.autoconfigure.consumer.MybatisPlusJoinIfAbsentConsumer;
+import com.github.yulichang.autoconfigure.consumer.MybatisPlusJoinIfPresentConsumer;
 import com.github.yulichang.autoconfigure.consumer.MybatisPlusJoinPropertiesConsumer;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.config.MPJInterceptorConfig;
@@ -11,7 +11,7 @@ import com.github.yulichang.extension.mapping.config.MappingConfig;
 import com.github.yulichang.injector.MPJSqlInjector;
 import com.github.yulichang.interceptor.MPJInterceptor;
 import com.github.yulichang.toolkit.SpringContentUtils;
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.slf4j.Logger;
@@ -63,7 +63,7 @@ public class MybatisPlusJoinAutoConfiguration {
 
     public MybatisPlusJoinAutoConfiguration(MybatisPlusJoinProperties properties,
                                             ObjectProvider<MybatisPlusJoinPropertiesConsumer> propertiesConsumers,
-                                            ObjectProvider<MybatisPlusJoinIfAbsentConsumer> ifAbsentConsumers) {
+                                            ObjectProvider<MybatisPlusJoinIfPresentConsumer> ifPresentConsumers) {
         this.properties = Optional.ofNullable(propertiesConsumers.getIfAvailable()).map(c -> c.config(properties)).orElse(properties);
         ConfigProperties.banner = this.properties.getBanner();
         ConfigProperties.subTableLogic = this.properties.getSubTableLogic();
@@ -72,9 +72,9 @@ public class MybatisPlusJoinAutoConfiguration {
         ConfigProperties.joinPrefix = this.properties.getJoinPrefix();
         ConfigProperties.logicDelType = this.properties.getLogicDelType();
         ConfigProperties.mappingMaxCount = this.properties.getMappingMaxCount();
-        ConfigProperties.ifAbsent = Optional.ofNullable(ifAbsentConsumers.getIfAvailable())
-                .map(m -> (BiPredicate<Object, IfAbsentSqlKeyWordEnum>) m)
-                .orElse((val, key) -> this.properties.getIfAbsent().test(val));
+        ConfigProperties.ifPresent = Optional.ofNullable(ifPresentConsumers.getIfAvailable())
+                .map(m -> (BiPredicate<Object, IfPresentSqlKeyWordEnum>) m)
+                .orElse((val, key) -> this.properties.getIfPresent().test(val));
         info("mybatis plus join properties config complete");
     }
 
diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java
index e30fe5a..5948c63 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java
@@ -1,6 +1,6 @@
 package com.github.yulichang.autoconfigure;
 
-import com.github.yulichang.config.enums.IfAbsentEnum;
+import com.github.yulichang.config.enums.IfPresentEnum;
 import com.github.yulichang.config.enums.LogicDelTypeEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -58,7 +58,7 @@ public class MybatisPlusJoinProperties {
     private String subQueryAlias = "st";
 
     /**
-     * Wrapper ifAbsent 判断策略
+     * Wrapper ifPresent 判断策略
      * <p>
      * NOT_NULL 非null
      * <p>
@@ -66,5 +66,5 @@ public class MybatisPlusJoinProperties {
      * <p>
      * NOT_BLANK 非空白字符串  例： "" -> false, " " -> false, "\r" -> false, "abc" -> true ...
      */
-    private IfAbsentEnum ifAbsent = IfAbsentEnum.NOT_EMPTY;
+    private IfPresentEnum ifPresent = IfPresentEnum.NOT_EMPTY;
 }
diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfAbsentConsumer.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfAbsentConsumer.java
deleted file mode 100644
index 3e2287c..0000000
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfAbsentConsumer.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.yulichang.autoconfigure.consumer;
-
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
-
-import java.util.function.BiPredicate;
-
-/**
- * 自定义IfAbsent策略
- *
- * @author yulichang
- * @since 1.4.9
- */
-public interface MybatisPlusJoinIfAbsentConsumer extends BiPredicate<Object, IfAbsentSqlKeyWordEnum> {
-}
diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfPresentConsumer.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfPresentConsumer.java
new file mode 100644
index 0000000..d5c4fe2
--- /dev/null
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfPresentConsumer.java
@@ -0,0 +1,14 @@
+package com.github.yulichang.autoconfigure.consumer;
+
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
+
+/**
+ * 自定义IfPresent策略
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+public interface MybatisPlusJoinIfPresentConsumer extends BiPredicate<Object, IfPresentSqlKeyWordEnum> {
+}
diff --git a/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index df4fbf5..b5e4f71 100644
--- a/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -57,10 +57,10 @@
       "description": "子查询表别名."
     },
     {
-      "name": "mybatis-plus-join.if-absent",
-      "defaultValue": "com.github.yulichang.config.enums.IfAbsentEnum.NOT_EMPTY",
-      "type": "com.github.yulichang.config.enums.IfAbsentEnum",
-      "description": "IfAbsent方法判断策略,如需自定义请用@Bean形式MybatisPlusJoinIfAbsent."
+      "name": "mybatis-plus-join.if-present",
+      "defaultValue": "com.github.yulichang.config.enums.IfPresentEnum.NOT_EMPTY",
+      "type": "com.github.yulichang.config.enums.IfPresentEnum",
+      "description": "IfPresent方法判断策略,如需自定义请用@Bean形式MybatisPlusJoinIfPresentConsumer."
     }
   ]
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
index 64b2a9a..d2e07ba 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
@@ -2,9 +2,9 @@ package com.github.yulichang.config;
 
 import com.github.yulichang.adapter.AdapterHelper;
 import com.github.yulichang.adapter.base.ITableInfoAdapter;
-import com.github.yulichang.config.enums.IfAbsentEnum;
+import com.github.yulichang.config.enums.IfPresentEnum;
 import com.github.yulichang.config.enums.LogicDelTypeEnum;
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
 
 import java.util.function.BiPredicate;
 
@@ -51,7 +51,7 @@ public class ConfigProperties {
      */
     public static String subQueryAlias = "st";
     /**
-     * Wrapper ifAbsent 判断策略
+     * Wrapper ifPresent 判断策略
      * <p>
      * NOT_NULL 非null
      * <p>
@@ -59,5 +59,5 @@ public class ConfigProperties {
      * <p>
      * NOT_BLANK 非空白字符串  例： "" -> false, " " -> false, "\r" -> false, "abc" -> true ...
      */
-    public static BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent = (val, key) -> IfAbsentEnum.NOT_EMPTY.test(val);
+    public static BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent = (val, key) -> IfPresentEnum.NOT_EMPTY.test(val);
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfPresentEnum.java
similarity index 89%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfPresentEnum.java
index 717567e..913aa74 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfAbsentEnum.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfPresentEnum.java
@@ -11,7 +11,7 @@ import java.util.function.Predicate;
  * @author yulichang
  * @since 1.4.9
  */
-public enum IfAbsentEnum implements Predicate<Object> {
+public enum IfPresentEnum implements Predicate<Object> {
 
     /**
      * 非null
@@ -28,7 +28,7 @@ public enum IfAbsentEnum implements Predicate<Object> {
 
     private final Predicate<Object> predicate;
 
-    IfAbsentEnum(Predicate<Object> predicate) {
+    IfPresentEnum(Predicate<Object> predicate) {
         this.predicate = predicate;
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
index ca03000..ed11efd 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.kt.interfaces.CompareIfAbsent;
+import com.github.yulichang.kt.interfaces.CompareIfPresent;
 import com.github.yulichang.kt.interfaces.Func;
 import com.github.yulichang.kt.interfaces.OnCompare;
 import com.github.yulichang.toolkit.KtUtils;
@@ -20,9 +20,9 @@ import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.Ref;
 import com.github.yulichang.toolkit.TableList;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
 import com.github.yulichang.wrapper.enums.PrefixEnum;
-import com.github.yulichang.wrapper.interfaces.CompareStrIfAbsent;
+import com.github.yulichang.wrapper.interfaces.CompareStrIfPresent;
 import com.github.yulichang.wrapper.interfaces.FuncStr;
 import com.github.yulichang.wrapper.interfaces.Join;
 import kotlin.reflect.KProperty;
@@ -47,8 +47,8 @@ import static java.util.stream.Collectors.joining;
  */
 @SuppressWarnings({"unused", "unchecked", "DuplicatedCode"})
 public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T, Children>> extends Wrapper<T>
-        implements CompareIfAbsent<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
-        CompareStrIfAbsent<Children, String>, FuncStr<Children, String> {
+        implements CompareIfPresent<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
+        CompareStrIfPresent<Children, String>, FuncStr<Children, String> {
 
     /**
      * 占位符
@@ -125,10 +125,10 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     protected boolean checkSqlInjection = false;
 
     /**
-     * ifAbsent 策略
+     * ifPresent 策略
      */
     @Getter
-    protected BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent = ConfigProperties.ifAbsent;
+    protected BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent = ConfigProperties.ifPresent;
 
     @Override
     public T getEntity() {
@@ -181,13 +181,13 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         return typedThis;
     }
 
-    public Children setIfAbsent(BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
-        this.ifAbsent = ifAbsent;
+    public Children setIfPresent(BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
+        this.ifPresent = ifPresent;
         return typedThis;
     }
 
-    public Children setIfAbsent(Predicate<Object> ifAbsent) {
-        this.ifAbsent = (o, k) -> ifAbsent.test(o);
+    public Children setIfPresent(Predicate<Object> ifPresent) {
+        this.ifPresent = (o, k) -> ifPresent.test(o);
         return typedThis;
     }
 
@@ -659,7 +659,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         index = null;
         isMain = true;
         isNo = false;
-        ifAbsent = ConfigProperties.ifAbsent;
+        ifPresent = ConfigProperties.ifPresent;
     }
 
     /**
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java
deleted file mode 100644
index 71ae0fe..0000000
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfAbsent.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.github.yulichang.kt.interfaces;
-
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
-import kotlin.reflect.KProperty;
-
-import java.util.function.BiPredicate;
-
-/**
- * ifAbsent
- *
- * @author yulichang
- * @since 1.4.9
- */
-@SuppressWarnings("unused")
-public interface CompareIfAbsent<Children> extends Compare<Children> {
-
-    BiPredicate<Object, IfAbsentSqlKeyWordEnum> getIfAbsent();
-
-    default Children eqIfAbsent(KProperty<?> column, Object val) {
-        return eq(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.EQ), null, column, val);
-    }
-
-    default Children eqIfAbsent(String alias, KProperty<?> column, Object val) {
-        return eq(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.EQ), alias, column, val);
-    }
-
-    default Children neIfAbsent(KProperty<?> column, Object val) {
-        return ne(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NE), null, column, val);
-    }
-
-    default Children neIfAbsent(String alias, KProperty<?> column, Object val) {
-        return ne(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NE), alias, column, val);
-    }
-
-    default Children gtIfAbsent(KProperty<?> column, Object val) {
-        return gt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GT), null, column, val);
-    }
-
-    default Children gtIfAbsent(String alias, KProperty<?> column, Object val) {
-        return gt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GT), alias, column, val);
-    }
-
-
-    default Children geIfAbsent(KProperty<?> column, Object val) {
-        return ge(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GE), null, column, val);
-    }
-
-    default Children geIfAbsent(String alias, KProperty<?> column, Object val) {
-        return ge(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GE), alias, column, val);
-    }
-
-    default Children ltIfAbsent(KProperty<?> column, Object val) {
-        return lt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LT), null, column, val);
-    }
-
-    default Children ltIfAbsent(String alias, KProperty<?> column, Object val) {
-        return lt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LT), alias, column, val);
-    }
-
-    default Children leIfAbsent(KProperty<?> column, Object val) {
-        return le(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LE), null, column, val);
-    }
-
-    default Children leIfAbsent(String alias, KProperty<?> column, Object val) {
-        return le(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LE), alias, column, val);
-    }
-
-    default Children likeIfAbsent(KProperty<?> column, Object val) {
-        return like(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE), null, column, val);
-    }
-
-    default Children likeIfAbsent(String alisa, KProperty<?> column, Object val) {
-        return like(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE), alisa, column, val);
-    }
-
-    default Children notLikeIfAbsent(KProperty<?> column, Object val) {
-        return notLike(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE), null, column, val);
-    }
-
-    default Children notLikeIfAbsent(String alias, KProperty<?> column, Object val) {
-        return notLike(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE), alias, column, val);
-    }
-
-    default Children likeLeftIfAbsent(KProperty<?> column, Object val) {
-        return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), null, column, val);
-    }
-
-    default Children likeLeftIfAbsent(String alias, KProperty<?> column, Object val) {
-        return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), alias, column, val);
-    }
-
-    default Children notLikeLeftIfAbsent(KProperty<?> column, Object val) {
-        return notLikeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_LEFT), null, column, val);
-    }
-
-    default Children notLikeLeftIfAbsent(String alias, KProperty<?> column, Object val) {
-        return notLikeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_LEFT), alias, column, val);
-    }
-
-    default Children likeRightIfAbsent(KProperty<?> column, Object val) {
-        return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), null, column, val);
-    }
-
-    default Children likeRightIfAbsent(String alias, KProperty<?> column, Object val) {
-        return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), alias, column, val);
-    }
-
-    default Children notLikeRightIfAbsent(KProperty<?> column, Object val) {
-        return notLikeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_RIGHT), null, column, val);
-    }
-
-    default Children notLikeRightIfAbsent(String alias, KProperty<?> column, Object val) {
-        return notLikeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_RIGHT), alias, column, val);
-    }
-}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfPresent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfPresent.java
new file mode 100644
index 0000000..ab1a0a6
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfPresent.java
@@ -0,0 +1,115 @@
+package com.github.yulichang.kt.interfaces;
+
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+import kotlin.reflect.KProperty;
+
+import java.util.function.BiPredicate;
+
+/**
+ * ifPresent
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public interface CompareIfPresent<Children> extends Compare<Children> {
+
+    BiPredicate<Object, IfPresentSqlKeyWordEnum> getIfPresent();
+
+    default Children eqIfPresent(KProperty<?> column, Object val) {
+        return eq(getIfPresent().test(val, IfPresentSqlKeyWordEnum.EQ), null, column, val);
+    }
+
+    default Children eqIfPresent(String alias, KProperty<?> column, Object val) {
+        return eq(getIfPresent().test(val, IfPresentSqlKeyWordEnum.EQ), alias, column, val);
+    }
+
+    default Children neIfPresent(KProperty<?> column, Object val) {
+        return ne(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NE), null, column, val);
+    }
+
+    default Children neIfPresent(String alias, KProperty<?> column, Object val) {
+        return ne(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NE), alias, column, val);
+    }
+
+    default Children gtIfPresent(KProperty<?> column, Object val) {
+        return gt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GT), null, column, val);
+    }
+
+    default Children gtIfPresent(String alias, KProperty<?> column, Object val) {
+        return gt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GT), alias, column, val);
+    }
+
+
+    default Children geIfPresent(KProperty<?> column, Object val) {
+        return ge(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GE), null, column, val);
+    }
+
+    default Children geIfPresent(String alias, KProperty<?> column, Object val) {
+        return ge(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GE), alias, column, val);
+    }
+
+    default Children ltIfPresent(KProperty<?> column, Object val) {
+        return lt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LT), null, column, val);
+    }
+
+    default Children ltIfPresent(String alias, KProperty<?> column, Object val) {
+        return lt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LT), alias, column, val);
+    }
+
+    default Children leIfPresent(KProperty<?> column, Object val) {
+        return le(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LE), null, column, val);
+    }
+
+    default Children leIfPresent(String alias, KProperty<?> column, Object val) {
+        return le(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LE), alias, column, val);
+    }
+
+    default Children likeIfPresent(KProperty<?> column, Object val) {
+        return like(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE), null, column, val);
+    }
+
+    default Children likeIfPresent(String alisa, KProperty<?> column, Object val) {
+        return like(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE), alisa, column, val);
+    }
+
+    default Children notLikeIfPresent(KProperty<?> column, Object val) {
+        return notLike(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE), null, column, val);
+    }
+
+    default Children notLikeIfPresent(String alias, KProperty<?> column, Object val) {
+        return notLike(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE), alias, column, val);
+    }
+
+    default Children likeLeftIfPresent(KProperty<?> column, Object val) {
+        return likeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_LEFT), null, column, val);
+    }
+
+    default Children likeLeftIfPresent(String alias, KProperty<?> column, Object val) {
+        return likeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_LEFT), alias, column, val);
+    }
+
+    default Children notLikeLeftIfPresent(KProperty<?> column, Object val) {
+        return notLikeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_LEFT), null, column, val);
+    }
+
+    default Children notLikeLeftIfPresent(String alias, KProperty<?> column, Object val) {
+        return notLikeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_LEFT), alias, column, val);
+    }
+
+    default Children likeRightIfPresent(KProperty<?> column, Object val) {
+        return likeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_RIGHT), null, column, val);
+    }
+
+    default Children likeRightIfPresent(String alias, KProperty<?> column, Object val) {
+        return likeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_RIGHT), alias, column, val);
+    }
+
+    default Children notLikeRightIfPresent(KProperty<?> column, Object val) {
+        return notLikeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_RIGHT), null, column, val);
+    }
+
+    default Children notLikeRightIfPresent(String alias, KProperty<?> column, Object val) {
+        return notLikeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_RIGHT), alias, column, val);
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
index ac13e59..97f880d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
@@ -9,12 +9,12 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.query.interfaces.CompareIfAbsent;
+import com.github.yulichang.query.interfaces.CompareIfPresent;
 import com.github.yulichang.query.interfaces.StringJoin;
 import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.ThrowOptional;
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
 import lombok.Getter;
 
 import java.io.UnsupportedEncodingException;
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 @SuppressWarnings("unused")
 public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambdaQueryWrapper<T>>
         implements Query<MPJLambdaQueryWrapper<T>, T, SFunction<T, ?>>, StringJoin<MPJLambdaQueryWrapper<T>, T>,
-        CompareIfAbsent<MPJLambdaQueryWrapper<T>, SFunction<T, ?>> {
+        CompareIfPresent<MPJLambdaQueryWrapper<T>, SFunction<T, ?>> {
 
     /**
      * 查询字段
@@ -78,7 +78,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
     private Function<String, String> tableNameFunc;
 
     @Getter
-    private BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent = ConfigProperties.ifAbsent;
+    private BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent = ConfigProperties.ifPresent;
 
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(entity)
@@ -94,7 +94,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
                           Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
                           SharedString lastSql, SharedString sqlComment, SharedString sqlFirst,
                           List<String> selectColumns, List<String> ignoreColumns, boolean selectDistinct,
-                          BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
+                          BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
         super.setEntity(entity);
         setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -108,7 +108,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
         this.selectColumns = selectColumns;
         this.ignoreColumns = ignoreColumns;
         this.selectDistinct = selectDistinct;
-        this.ifAbsent = ifAbsent;
+        this.ifPresent = ifPresent;
     }
 
     /**
@@ -235,7 +235,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
     public MPJQueryWrapper<T> stringQuery() {
         return new MPJQueryWrapper<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs,
                 expression, sqlSelect, from, lastSql, sqlComment, sqlFirst, selectColumns, ignoreColumns,
-                selectDistinct, ifAbsent);
+                selectDistinct, ifPresent);
     }
 
     @Override
@@ -337,13 +337,13 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
         return this.tableNameFunc.apply(decode);
     }
 
-    public MPJLambdaQueryWrapper<T> setIfAbsent(BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
-        this.ifAbsent = ifAbsent;
+    public MPJLambdaQueryWrapper<T> setIfPresent(BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
+        this.ifPresent = ifPresent;
         return typedThis;
     }
 
-    public MPJLambdaQueryWrapper<T> setIfAbsent(Predicate<Object> ifAbsent) {
-        this.ifAbsent = (o, k) -> ifAbsent.test(o);
+    public MPJLambdaQueryWrapper<T> setIfPresent(Predicate<Object> ifPresent) {
+        this.ifPresent = (o, k) -> ifPresent.test(o);
         return typedThis;
     }
 
@@ -355,7 +355,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
     protected MPJLambdaQueryWrapper<T> instance() {
         return new MPJLambdaQueryWrapper<>(getEntity(), getEntityClass(), null, null, paramNameSeq, paramNameValuePairs,
                 new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
-                null, null, selectDistinct, ifAbsent);
+                null, null, selectDistinct, ifPresent);
     }
 
     @Override
@@ -391,7 +391,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
         from.toNull();
         selectColumns.clear();
         ignoreColumns.clear();
-        ifAbsent = ConfigProperties.ifAbsent;
+        ifPresent = ConfigProperties.ifPresent;
     }
 
     @Override
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
index 4031175..a13cabb 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
@@ -11,13 +11,13 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.query.interfaces.CompareIfAbsent;
+import com.github.yulichang.query.interfaces.CompareIfPresent;
 import com.github.yulichang.query.interfaces.StringJoin;
 import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.ThrowOptional;
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
 import com.github.yulichang.wrapper.interfaces.Chain;
 import lombok.Getter;
 
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
 @SuppressWarnings("unused")
 public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapper<T>> implements
         Query<MPJQueryWrapper<T>, T, String>, StringJoin<MPJQueryWrapper<T>, T>, Chain<T>,
-        CompareIfAbsent<MPJQueryWrapper<T>, String> {
+        CompareIfPresent<MPJQueryWrapper<T>, String> {
 
     /**
      * 查询字段
@@ -91,7 +91,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
     private boolean checkSqlInjection = false;
 
     @Getter
-    private BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent = ConfigProperties.ifAbsent;
+    private BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent = ConfigProperties.ifPresent;
 
 
     public MPJQueryWrapper() {
@@ -124,7 +124,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
                            SharedString sqlSelect, SharedString from, SharedString lastSql,
                            SharedString sqlComment, SharedString sqlFirst,
                            List<String> selectColumns, List<String> ignoreColumns, boolean selectDistinct,
-                           BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
+                           BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
         super.setEntity(entity);
         setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -138,7 +138,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
         this.selectColumns = selectColumns;
         this.ignoreColumns = ignoreColumns;
         this.selectDistinct = selectDistinct;
-        this.ifAbsent = ifAbsent;
+        this.ifPresent = ifPresent;
     }
 
     /**
@@ -149,13 +149,13 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
         return this;
     }
 
-    public MPJQueryWrapper<T> setIfAbsent(BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
-        this.ifAbsent = ifAbsent;
+    public MPJQueryWrapper<T> setIfPresent(BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
+        this.ifPresent = ifPresent;
         return this;
     }
 
-    public MPJQueryWrapper<T> setIfAbsent(Predicate<Object> ifAbsent) {
-        this.ifAbsent = (o, k) -> ifAbsent.test(o);
+    public MPJQueryWrapper<T> setIfPresent(Predicate<Object> ifPresent) {
+        this.ifPresent = (o, k) -> ifPresent.test(o);
         return this;
     }
 
@@ -354,7 +354,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
      */
     public MPJLambdaQueryWrapper<T> lambda() {
         return new MPJLambdaQueryWrapper<>(getEntity(), getEntityClass(), from, sqlSelect, paramNameSeq, paramNameValuePairs,
-                expression, lastSql, sqlComment, getSqlFirstField(), selectColumns, ignoreColumns, selectDistinct, ifAbsent);
+                expression, lastSql, sqlComment, getSqlFirstField(), selectColumns, ignoreColumns, selectDistinct, ifPresent);
     }
 
     @Override
@@ -391,7 +391,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
     protected MPJQueryWrapper<T> instance() {
         return new MPJQueryWrapper<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs, new MergeSegments(),
                 null, null, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
-                null, null, selectDistinct, ifAbsent);
+                null, null, selectDistinct, ifPresent);
     }
 
 
@@ -402,7 +402,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
         from.toNull();
         selectColumns.clear();
         ignoreColumns.clear();
-        ifAbsent = ConfigProperties.ifAbsent;
+        ifPresent = ConfigProperties.ifPresent;
     }
 
     @Override
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfAbsent.java
deleted file mode 100644
index ccf8eb8..0000000
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfAbsent.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.github.yulichang.query.interfaces;
-
-import com.baomidou.mybatisplus.core.conditions.interfaces.Compare;
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
-
-import java.util.function.BiPredicate;
-
-/**
- * 查询条件封装
- * <p>比较值</p>
- *
- * @author yulichang
- * @since 1.4.9
- */
-@SuppressWarnings("unused")
-public interface CompareIfAbsent<Children, R> extends Compare<Children, R> {
-
-    BiPredicate<Object, IfAbsentSqlKeyWordEnum> getIfAbsent();
-
-    /**
-     * 等于 =
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children eqIfAbsent(R column, Object val) {
-        return eq(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.EQ), column, val);
-    }
-
-    /**
-     * 不等于 &lt;&gt;
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children neIfAbsent(R column, Object val) {
-        return ne(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NE), column, val);
-    }
-
-    /**
-     * 大于 &gt;
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children gtIfAbsent(R column, Object val) {
-        return gt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GT), column, val);
-    }
-
-    /**
-     * 大于等于 &gt;=
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children geIfAbsent(R column, Object val) {
-        return ge(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GE), column, val);
-    }
-
-    /**
-     * 小于 &lt;
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children ltIfAbsent(R column, Object val) {
-        return lt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LT), column, val);
-    }
-
-    /**
-     * 小于等于 &lt;=
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children leIfAbsent(R column, Object val) {
-        return le(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LE), column, val);
-    }
-
-    /**
-     * LIKE '%值%'
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children likeIfAbsent(R column, Object val) {
-        return like(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE), column, val);
-    }
-
-    /**
-     * NOT LIKE '%值%'
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children notLikeIfAbsent(R column, Object val) {
-        return notLike(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE), column, val);
-    }
-
-    /**
-     * NOT LIKE '%值'
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children notLikeLeftIfAbsent(R column, Object val) {
-        return notLikeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_LEFT), column, val);
-    }
-
-    /**
-     * NOT LIKE '值%'
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children notLikeRightIfAbsent(R column, Object val) {
-        return notLikeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_RIGHT), column, val);
-    }
-
-    /**
-     * LIKE '%值'
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children likeLeftIfAbsent(R column, Object val) {
-        return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), column, val);
-    }
-
-    /**
-     * LIKE '值%'
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children likeRightIfAbsent(R column, Object val) {
-        return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), column, val);
-    }
-}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfPresent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfPresent.java
new file mode 100644
index 0000000..06b9066
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfPresent.java
@@ -0,0 +1,151 @@
+package com.github.yulichang.query.interfaces;
+
+import com.baomidou.mybatisplus.core.conditions.interfaces.Compare;
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
+
+/**
+ * 查询条件封装
+ * <p>比较值</p>
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public interface CompareIfPresent<Children, R> extends Compare<Children, R> {
+
+    BiPredicate<Object, IfPresentSqlKeyWordEnum> getIfPresent();
+
+    /**
+     * 等于 =
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children eqIfPresent(R column, Object val) {
+        return eq(getIfPresent().test(val, IfPresentSqlKeyWordEnum.EQ), column, val);
+    }
+
+    /**
+     * 不等于 &lt;&gt;
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children neIfPresent(R column, Object val) {
+        return ne(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NE), column, val);
+    }
+
+    /**
+     * 大于 &gt;
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children gtIfPresent(R column, Object val) {
+        return gt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GT), column, val);
+    }
+
+    /**
+     * 大于等于 &gt;=
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children geIfPresent(R column, Object val) {
+        return ge(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GE), column, val);
+    }
+
+    /**
+     * 小于 &lt;
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children ltIfPresent(R column, Object val) {
+        return lt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LT), column, val);
+    }
+
+    /**
+     * 小于等于 &lt;=
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children leIfPresent(R column, Object val) {
+        return le(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LE), column, val);
+    }
+
+    /**
+     * LIKE '%值%'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children likeIfPresent(R column, Object val) {
+        return like(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE), column, val);
+    }
+
+    /**
+     * NOT LIKE '%值%'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children notLikeIfPresent(R column, Object val) {
+        return notLike(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE), column, val);
+    }
+
+    /**
+     * NOT LIKE '%值'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children notLikeLeftIfPresent(R column, Object val) {
+        return notLikeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_LEFT), column, val);
+    }
+
+    /**
+     * NOT LIKE '值%'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children notLikeRightIfPresent(R column, Object val) {
+        return notLikeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_RIGHT), column, val);
+    }
+
+    /**
+     * LIKE '%值'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children likeLeftIfPresent(R column, Object val) {
+        return likeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_LEFT), column, val);
+    }
+
+    /**
+     * LIKE '值%'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children likeRightIfPresent(R column, Object val) {
+        return likeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_RIGHT), column, val);
+    }
+}
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 7e97c4d..785c690 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
@@ -18,7 +18,7 @@ import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.Ref;
 import com.github.yulichang.toolkit.TableList;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
 import com.github.yulichang.wrapper.enums.PrefixEnum;
 import com.github.yulichang.wrapper.interfaces.*;
 import lombok.Getter;
@@ -42,8 +42,8 @@ import static java.util.stream.Collectors.joining;
  */
 @SuppressWarnings({"unchecked", "unused", "DuplicatedCode"})
 public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrapper<T, Children>> extends Wrapper<T>
-        implements CompareIfAbsent<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
-        CompareStrIfAbsent<Children, String>, FuncStr<Children, String> {
+        implements CompareIfPresent<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
+        CompareStrIfPresent<Children, String>, FuncStr<Children, String> {
 
     /**
      * 占位符
@@ -120,10 +120,10 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
     protected boolean checkSqlInjection = false;
 
     /**
-     * ifAbsent 策略
+     * ifPresent 策略
      */
     @Getter
-    protected BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent = ConfigProperties.ifAbsent;
+    protected BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent = ConfigProperties.ifPresent;
 
     @Override
     public T getEntity() {
@@ -176,20 +176,20 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
         return typedThis;
     }
 
-    public Children setIfAbsent(BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
-        this.ifAbsent = ifAbsent;
+    public Children setIfPresent(BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
+        this.ifPresent = ifPresent;
         return typedThis;
     }
 
     /**
-     * 设置 ifAbsent
-     * .setIfAbsent(val -> val != null && StringUtils.isNotBlank(val))
+     * 设置 ifPresent
+     * .ifPresent(val -> val != null && StringUtils.isNotBlank(val))
      *
-     * @param ifAbsent 判断
+     * @param ifPresent 判断
      * @return Children
      */
-    public Children setIfAbsent(Predicate<Object> ifAbsent) {
-        this.ifAbsent = (obj, key) -> ifAbsent.test(obj);
+    public Children setIfPresent(Predicate<Object> ifPresent) {
+        this.ifPresent = (obj, key) -> ifPresent.test(obj);
         return typedThis;
     }
 
@@ -773,7 +773,7 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
         index = null;
         isMain = true;
         isOn = false;
-        ifAbsent = ConfigProperties.ifAbsent;
+        ifPresent = ConfigProperties.ifPresent;
     }
 
     /**
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index 488be2e..4a5bd01 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -9,7 +9,7 @@ import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.*;
 import com.github.yulichang.toolkit.support.ColumnCache;
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
 import com.github.yulichang.wrapper.interfaces.Chain;
 import com.github.yulichang.wrapper.interfaces.Query;
 import com.github.yulichang.wrapper.interfaces.QueryLabel;
@@ -126,7 +126,7 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
                      Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments, SharedString paramAlias,
                      SharedString lastSql, SharedString sqlComment, SharedString sqlFirst,
                      TableList tableList, Integer index, String keyWord, Class<?> joinClass, String tableName,
-                     BiPredicate<Object, IfAbsentSqlKeyWordEnum> ifAbsent) {
+                     BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
         super.setEntity(entity);
         super.setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -142,7 +142,7 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
         this.keyWord = keyWord;
         this.joinClass = joinClass;
         this.tableName = tableName;
-        this.ifAbsent = ifAbsent;
+        this.ifPresent = ifPresent;
     }
 
 
@@ -211,7 +211,7 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
         MPJLambdaWrapper<E> wrapper = new MPJLambdaWrapper<E>(null, clazz, SharedString.emptyString(),
                 paramNameSeq, paramNameValuePairs, new MergeSegments(), new SharedString(this.paramAlias
                 .getStringValue()), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
-                new TableList(), null, null, null, null, ifAbsent) {
+                new TableList(), null, null, null, null, ifPresent) {
         };
         wrapper.tableList.setAlias(st);
         wrapper.tableList.setRootClass(clazz);
@@ -406,7 +406,7 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
     protected MPJLambdaWrapper<T> instance(Integer index, String keyWord, Class<?> joinClass, String tableName) {
         return new MPJLambdaWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs,
                 new MergeSegments(), this.paramAlias, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
-                this.tableList, index, keyWord, joinClass, tableName, ifAbsent);
+                this.tableList, index, keyWord, joinClass, tableName, ifPresent);
     }
 
     @Override
@@ -419,6 +419,6 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
         if (Objects.nonNull(wrapperMap)) wrapperMap.clear();
         if (Objects.nonNull(unionSql)) unionSql.toEmpty();
         resultMapMybatisLabel.clear();
-        ifAbsent = ConfigProperties.ifAbsent;
+        ifPresent = ConfigProperties.ifPresent;
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfAbsentSqlKeyWordEnum.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfPresentSqlKeyWordEnum.java
similarity index 87%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfAbsentSqlKeyWordEnum.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfPresentSqlKeyWordEnum.java
index 43ad591..0ce627c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfAbsentSqlKeyWordEnum.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfPresentSqlKeyWordEnum.java
@@ -6,7 +6,7 @@ package com.github.yulichang.wrapper.enums;
  * @author yulichang
  * @since 1.4.9
  */
-public enum IfAbsentSqlKeyWordEnum {
+public enum IfPresentSqlKeyWordEnum {
     EQ,
     NE,
     GT,
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java
deleted file mode 100644
index 51582cc..0000000
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfAbsent.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.github.yulichang.wrapper.interfaces;
-
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
-
-import java.util.function.BiPredicate;
-
-/**
- * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
- *
- * @author yulichang
- * @since 1.4.9
- */
-@SuppressWarnings("unused")
-public interface CompareIfAbsent<Children> extends Compare<Children> {
-
-    BiPredicate<Object, IfAbsentSqlKeyWordEnum> getIfAbsent();
-
-    default <R> Children eqIfAbsent(SFunction<R, ?> column, Object val) {
-        return eq(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.EQ), null, column, val);
-    }
-
-    default <R> Children eqIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return eq(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.EQ), alias, column, val);
-    }
-
-    default <R> Children neIfAbsent(SFunction<R, ?> column, Object val) {
-        return ne(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NE), null, column, val);
-    }
-
-    default <R> Children neIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return ne(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NE), alias, column, val);
-    }
-
-    default <R> Children gtIfAbsent(SFunction<R, ?> column, Object val) {
-        return gt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GT), null, column, val);
-    }
-
-    default <R> Children gtIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return gt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GT), alias, column, val);
-    }
-
-    default <R> Children geIfAbsent(SFunction<R, ?> column, Object val) {
-        return ge(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GE), null, column, val);
-    }
-
-    default <R> Children geIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return ge(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GE), alias, column, val);
-    }
-
-    default <R> Children ltIfAbsent(SFunction<R, ?> column, Object val) {
-        return lt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LT), null, column, val);
-    }
-
-    default <R> Children ltIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return lt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LT), alias, column, val);
-    }
-
-    default <R> Children leIfAbsent(SFunction<R, ?> column, Object val) {
-        return le(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LE), null, column, val);
-    }
-
-    default <R> Children leIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return le(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LE), alias, column, val);
-    }
-
-    default <R> Children likeIfAbsent(SFunction<R, ?> column, Object val) {
-        return like(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE), null, column, val);
-    }
-
-    default <R> Children likeIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return like(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE), alias, column, val);
-    }
-
-    default <R> Children notLikeIfAbsent(SFunction<R, ?> column, Object val) {
-        return notLike(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE), null, column, val);
-    }
-
-    default <R> Children notLikeIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return notLike(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE), alias, column, val);
-    }
-
-    default <R> Children likeLeftIfAbsent(SFunction<R, ?> column, Object val) {
-        return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), null, column, val);
-    }
-
-    default <R> Children likeLeftIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), alias, column, val);
-    }
-
-    default <R> Children notLikeLeftIfAbsent(SFunction<R, ?> column, Object val) {
-        return notLikeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_LEFT), null, column, val);
-    }
-
-    default <R> Children notLikeLeftIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return notLikeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_LEFT), alias, column, val);
-    }
-
-    default <R> Children likeRightIfAbsent(SFunction<R, ?> column, Object val) {
-        return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), null, column, val);
-    }
-
-    default <R> Children likeRightIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), alias, column, val);
-    }
-
-    default <R> Children notLikeRightIfAbsent(SFunction<R, ?> column, Object val) {
-        return notLikeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_RIGHT), null, column, val);
-    }
-
-    default <R> Children notLikeRightIfAbsent(String alias, SFunction<R, ?> column, Object val) {
-        return notLikeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_RIGHT), alias, column, val);
-    }
-}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfPresent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfPresent.java
new file mode 100644
index 0000000..28c493f
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfPresent.java
@@ -0,0 +1,114 @@
+package com.github.yulichang.wrapper.interfaces;
+
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
+
+/**
+ * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public interface CompareIfPresent<Children> extends Compare<Children> {
+
+    BiPredicate<Object, IfPresentSqlKeyWordEnum> getIfPresent();
+
+    default <R> Children eqIfPresent(SFunction<R, ?> column, Object val) {
+        return eq(getIfPresent().test(val, IfPresentSqlKeyWordEnum.EQ), null, column, val);
+    }
+
+    default <R> Children eqIfPresent(String alias, SFunction<R, ?> column, Object val) {
+        return eq(getIfPresent().test(val, IfPresentSqlKeyWordEnum.EQ), alias, column, val);
+    }
+
+    default <R> Children neIfPresent(SFunction<R, ?> column, Object val) {
+        return ne(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NE), null, column, val);
+    }
+
+    default <R> Children neIfPresent(String alias, SFunction<R, ?> column, Object val) {
+        return ne(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NE), alias, column, val);
+    }
+
+    default <R> Children gtIfPresent(SFunction<R, ?> column, Object val) {
+        return gt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GT), null, column, val);
+    }
+
+    default <R> Children gtIfPresent(String alias, SFunction<R, ?> column, Object val) {
+        return gt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GT), alias, column, val);
+    }
+
+    default <R> Children geIfPresent(SFunction<R, ?> column, Object val) {
+        return ge(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GE), null, column, val);
+    }
+
+    default <R> Children geIfPresent(String alias, SFunction<R, ?> column, Object val) {
+        return ge(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GE), alias, column, val);
+    }
+
+    default <R> Children ltIfPresent(SFunction<R, ?> column, Object val) {
+        return lt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LT), null, column, val);
+    }
+
+    default <R> Children ltIfPresent(String alias, SFunction<R, ?> column, Object val) {
+        return lt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LT), alias, column, val);
+    }
+
+    default <R> Children leIfPresent(SFunction<R, ?> column, Object val) {
+        return le(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LE), null, column, val);
+    }
+
+    default <R> Children leIfPresent(String alias, SFunction<R, ?> column, Object val) {
+        return le(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LE), alias, column, val);
+    }
+
+    default <R> Children likeIfPresent(SFunction<R, ?> column, Object val) {
+        return like(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE), null, column, val);
+    }
+
+    default <R> Children likeIfPresent(String alias, SFunction<R, ?> column, Object val) {
+        return like(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE), alias, column, val);
+    }
+
+    default <R> Children notLikeIfPresent(SFunction<R, ?> column, Object val) {
+        return notLike(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE), null, column, val);
+    }
+
+    default <R> Children notLikeIfPresent(String alias, SFunction<R, ?> column, Object val) {
+        return notLike(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE), alias, column, val);
+    }
+
+    default <R> Children likeLeftIfPresent(SFunction<R, ?> column, Object val) {
+        return likeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_LEFT), null, column, val);
+    }
+
+    default <R> Children likeLeftIfPresent(String alias, SFunction<R, ?> column, Object val) {
+        return likeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_LEFT), alias, column, val);
+    }
+
+    default <R> Children notLikeLeftIfPresent(SFunction<R, ?> column, Object val) {
+        return notLikeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_LEFT), null, column, val);
+    }
+
+    default <R> Children notLikeLeftIfPresent(String alias, SFunction<R, ?> column, Object val) {
+        return notLikeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_LEFT), alias, column, val);
+    }
+
+    default <R> Children likeRightIfPresent(SFunction<R, ?> column, Object val) {
+        return likeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_RIGHT), null, column, val);
+    }
+
+    default <R> Children likeRightIfPresent(String alias, SFunction<R, ?> column, Object val) {
+        return likeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_RIGHT), alias, column, val);
+    }
+
+    default <R> Children notLikeRightIfPresent(SFunction<R, ?> column, Object val) {
+        return notLikeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_RIGHT), null, column, val);
+    }
+
+    default <R> Children notLikeRightIfPresent(String alias, SFunction<R, ?> column, Object val) {
+        return notLikeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_RIGHT), alias, column, val);
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java
deleted file mode 100644
index a58520d..0000000
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfAbsent.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.github.yulichang.wrapper.interfaces;
-
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
-
-import java.util.function.BiPredicate;
-
-/**
- * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
- *
- * @author yulichang
- * @since 1.4.9
- */
-@SuppressWarnings("unused")
-public interface CompareStrIfAbsent<Children, R> extends CompareStr<Children, R> {
-
-    BiPredicate<Object, IfAbsentSqlKeyWordEnum> getIfAbsent();
-
-    default Children eqIfAbsent(R column, Object val) {
-        return eq(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.EQ), column, val);
-    }
-
-    default Children neIfAbsent(R column, Object val) {
-        return ne(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NE), column, val);
-    }
-
-    default Children gtIfAbsent(R column, Object val) {
-        return gt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GT), column, val);
-    }
-
-    default Children geIfAbsent(R column, Object val) {
-        return ge(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.GE), column, val);
-    }
-
-    default Children ltIfAbsent(R column, Object val) {
-        return lt(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LT), column, val);
-    }
-
-    default Children leIfAbsent(R column, Object val) {
-        return le(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LE), column, val);
-    }
-
-    default Children likeIfAbsent(R column, Object val) {
-        return like(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE), column, val);
-    }
-
-    default Children notLikeIfAbsent(R column, Object val) {
-        return notLike(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE), column, val);
-    }
-
-    default Children likeLeftIfAbsent(R column, Object val) {
-        return likeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_LEFT), column, val);
-    }
-
-    default Children likeRightIfAbsent(R column, Object val) {
-        return likeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.LIKE_RIGHT), column, val);
-    }
-
-    default Children notLikeLeftIfAbsent(R column, Object val) {
-        return notLikeLeft(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_LEFT), column, val);
-    }
-
-    default Children notLikeRightIfAbsent(R column, Object val) {
-        return notLikeRight(getIfAbsent().test(val, IfAbsentSqlKeyWordEnum.NOT_LIKE_RIGHT), column, val);
-    }
-}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfPresent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfPresent.java
new file mode 100644
index 0000000..04b77fd
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfPresent.java
@@ -0,0 +1,65 @@
+package com.github.yulichang.wrapper.interfaces;
+
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
+
+/**
+ * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public interface CompareStrIfPresent<Children, R> extends CompareStr<Children, R> {
+
+    BiPredicate<Object, IfPresentSqlKeyWordEnum> getIfPresent();
+
+    default Children eqIfPresent(R column, Object val) {
+        return eq(getIfPresent().test(val, IfPresentSqlKeyWordEnum.EQ), column, val);
+    }
+
+    default Children neIfPresent(R column, Object val) {
+        return ne(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NE), column, val);
+    }
+
+    default Children gtIfPresent(R column, Object val) {
+        return gt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GT), column, val);
+    }
+
+    default Children geIfPresent(R column, Object val) {
+        return ge(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GE), column, val);
+    }
+
+    default Children ltIfPresent(R column, Object val) {
+        return lt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LT), column, val);
+    }
+
+    default Children leIfPresent(R column, Object val) {
+        return le(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LE), column, val);
+    }
+
+    default Children likeIfPresent(R column, Object val) {
+        return like(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE), column, val);
+    }
+
+    default Children notLikeIfPresent(R column, Object val) {
+        return notLike(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE), column, val);
+    }
+
+    default Children likeLeftIfPresent(R column, Object val) {
+        return likeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_LEFT), column, val);
+    }
+
+    default Children likeRightIfPresent(R column, Object val) {
+        return likeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_RIGHT), column, val);
+    }
+
+    default Children notLikeLeftIfPresent(R column, Object val) {
+        return notLikeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_LEFT), column, val);
+    }
+
+    default Children notLikeRightIfPresent(R column, Object val) {
+        return notLikeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_RIGHT), column, val);
+    }
+}
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
index d6fad17..655dbc9 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
@@ -3,13 +3,13 @@ package com.github.yulichang.mybatisplusjoin.solon.plugin;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.config.MPJInterceptorConfig;
-import com.github.yulichang.config.enums.IfAbsentEnum;
+import com.github.yulichang.config.enums.IfPresentEnum;
 import com.github.yulichang.config.enums.LogicDelTypeEnum;
 import com.github.yulichang.extension.mapping.config.MappingConfig;
 import com.github.yulichang.injector.MPJSqlInjector;
 import com.github.yulichang.toolkit.SpringContentUtils;
 import com.github.yulichang.toolkit.reflect.GenericTypeUtils;
-import com.github.yulichang.wrapper.enums.IfAbsentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.solon.MybatisAdapter;
 import org.apache.ibatis.solon.integration.MybatisAdapterManager;
@@ -59,10 +59,10 @@ public class XPluginImpl implements Plugin {
                 Arrays.stream(LogicDelTypeEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()
                         .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.logicDelType 配置错误")));
         ConfigProperties.mappingMaxCount = prop.get("mappingMaxCount", Integer::parseInt);
-        ConfigProperties.ifAbsent = prop.get("ifAbsent", val ->
-                Arrays.stream(IfAbsentEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()
-                        .map(m -> (BiPredicate<Object, IfAbsentSqlKeyWordEnum>) (o, enums) -> m.test(o))
-                        .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.ifAbsent 配置错误")));
+        ConfigProperties.ifPresent = prop.get("ifPresent", val ->
+                Arrays.stream(IfPresentEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()
+                        .map(m -> (BiPredicate<Object, IfPresentSqlKeyWordEnum>) (o, enums) -> m.test(o))
+                        .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.ifPresent 配置错误")));
         // 后续操作
         context.onEvent(AppLoadEndEvent.class, e -> {
             List<SqlSessionFactory> sqlSessionFactoryList = MybatisAdapterManager.getAll().values().stream()
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/CustomWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/CustomWrapperTest.java
index 7808b7f..d2114db 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/CustomWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/CustomWrapperTest.java
@@ -34,7 +34,8 @@ public class CustomWrapperTest {
             return null;
         }
 
-        public <X> CWrapper<T> eqIfAbsent(SFunction<X, ?> column, Object val) {
+        @Override
+        public <X> CWrapper<T> eqIfPresent(SFunction<X, ?> column, Object val) {
             super.eq(Objects.nonNull(val), column, val);
             return this;
         }
@@ -47,7 +48,7 @@ public class CustomWrapperTest {
                 .selectAll(UserDO.class)
 //                .toChildren(new Ref<CWrapper<UserDO>>())
                 .toChildren(CWrapper::toCWrapper)
-                .eqIfAbsent(UserDO::getId, 1);
+                .eqIfPresent(UserDO::getId, 1);
         List<UserDO> dos = userMapper.selectList(wrapper);
         dos.forEach(System.out::println);
 
@@ -56,7 +57,7 @@ public class CustomWrapperTest {
                 .selectAll(UserDO.class)
                 .toChildren(new Ref<CWrapper<UserDO>>())
 //                .toChildren(CWrapper::toCWrapper)
-                .eqIfAbsent(UserDO::getId, null);
+                .eqIfPresent(UserDO::getId, null);
         List<UserDO> dos1 = userMapper.selectList(wrapper1);
         dos1.forEach(System.out::println);
     }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfPresentTest.java
similarity index 53%
rename from mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
rename to mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfPresentTest.java
index f12eedd..5101c39 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfAbsentTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfPresentTest.java
@@ -1,6 +1,6 @@
 package com.github.yulichang.test.join.m;
 
-import com.github.yulichang.config.enums.IfAbsentEnum;
+import com.github.yulichang.config.enums.IfPresentEnum;
 import com.github.yulichang.test.join.entity.UserDO;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
@@ -13,7 +13,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import java.util.List;
 
 @SpringBootTest
-public class IfAbsentTest {
+public class IfPresentTest {
 
     @BeforeEach
     void setUp() {
@@ -21,35 +21,35 @@ public class IfAbsentTest {
     }
 
     @Test
-    void ifAbsent() {
-        assert IfAbsentEnum.NOT_EMPTY.test("\t");
-        assert !IfAbsentEnum.NOT_EMPTY.test("");
-        assert IfAbsentEnum.NOT_EMPTY.test(" ");
-        assert IfAbsentEnum.NOT_EMPTY.test("\r");
-        assert IfAbsentEnum.NOT_EMPTY.test("a");
-        assert IfAbsentEnum.NOT_EMPTY.test(1);
-        assert IfAbsentEnum.NOT_EMPTY.test(true);
-        assert IfAbsentEnum.NOT_EMPTY.test('A');
+    void ifPresent() {
+        assert IfPresentEnum.NOT_EMPTY.test("\t");
+        assert !IfPresentEnum.NOT_EMPTY.test("");
+        assert IfPresentEnum.NOT_EMPTY.test(" ");
+        assert IfPresentEnum.NOT_EMPTY.test("\r");
+        assert IfPresentEnum.NOT_EMPTY.test("a");
+        assert IfPresentEnum.NOT_EMPTY.test(1);
+        assert IfPresentEnum.NOT_EMPTY.test(true);
+        assert IfPresentEnum.NOT_EMPTY.test('A');
 
-        assert !IfAbsentEnum.NOT_BLANK.test("\t");
-        assert !IfAbsentEnum.NOT_BLANK.test("");
-        assert !IfAbsentEnum.NOT_BLANK.test(" ");
-        assert !IfAbsentEnum.NOT_BLANK.test("\r");
-        assert IfAbsentEnum.NOT_BLANK.test("a");
-        assert IfAbsentEnum.NOT_EMPTY.test(1);
-        assert IfAbsentEnum.NOT_EMPTY.test(true);
-        assert IfAbsentEnum.NOT_EMPTY.test('A');
+        assert !IfPresentEnum.NOT_BLANK.test("\t");
+        assert !IfPresentEnum.NOT_BLANK.test("");
+        assert !IfPresentEnum.NOT_BLANK.test(" ");
+        assert !IfPresentEnum.NOT_BLANK.test("\r");
+        assert IfPresentEnum.NOT_BLANK.test("a");
+        assert IfPresentEnum.NOT_EMPTY.test(1);
+        assert IfPresentEnum.NOT_EMPTY.test(true);
+        assert IfPresentEnum.NOT_EMPTY.test('A');
 
         ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
                 "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
                 "WHERE t.del = false AND (t.id = ? AND t.head_img = ? AND t.`name` = ?)");
         MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
-                .eqIfAbsent(UserDO::getId, 1)
-                .eqIfAbsent(UserDO::getPid, null)
-                .eqIfAbsent(UserDO::getAddressId, "")
-                .eqIfAbsent(UserDO::getImg, "\t")
-                .eqIfAbsent(UserDO::getName, "张三 1");
+                .eqIfPresent(UserDO::getId, 1)
+                .eqIfPresent(UserDO::getPid, null)
+                .eqIfPresent(UserDO::getAddressId, "")
+                .eqIfPresent(UserDO::getImg, "\t")
+                .eqIfPresent(UserDO::getName, "张三 1");
         List<UserDO> list = wrapper.list();
         list.forEach(System.out::println);
 
@@ -58,12 +58,12 @@ public class IfAbsentTest {
                 "WHERE t.del = false AND (t.id = ? AND t.`name` = ?)");
         MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
-                .setIfAbsent(IfAbsentEnum.NOT_BLANK)
-                .eqIfAbsent(UserDO::getId, 1)
-                .eqIfAbsent(UserDO::getPid, null)
-                .eqIfAbsent(UserDO::getAddressId, "")
-                .eqIfAbsent(UserDO::getImg, "\t")
-                .eqIfAbsent(UserDO::getName, "张三 1");
+                .setIfPresent(IfPresentEnum.NOT_BLANK)
+                .eqIfPresent(UserDO::getId, 1)
+                .eqIfPresent(UserDO::getPid, null)
+                .eqIfPresent(UserDO::getAddressId, "")
+                .eqIfPresent(UserDO::getImg, "\t")
+                .eqIfPresent(UserDO::getName, "张三 1");
         List<UserDO> list1 = wrapper1.list();
         list1.forEach(System.out::println);
 
@@ -72,12 +72,12 @@ public class IfAbsentTest {
                 "WHERE t.del = false AND (t.id = ? AND t.pid = ? AND t.`name` = ? AND t.head_img = ? AND t.`name` = ?)");
         MPJLambdaWrapper<UserDO> wrapper2 = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
-                .setIfAbsent(o -> true)
-                .eqIfAbsent(UserDO::getId, 1)
-                .eqIfAbsent(UserDO::getPid, null)
-                .eqIfAbsent(UserDO::getName, "")
-                .eqIfAbsent(UserDO::getImg, "\t")
-                .eqIfAbsent(UserDO::getName, "张三 1");
+                .setIfPresent(o -> true)
+                .eqIfPresent(UserDO::getId, 1)
+                .eqIfPresent(UserDO::getPid, null)
+                .eqIfPresent(UserDO::getName, "")
+                .eqIfPresent(UserDO::getImg, "\t")
+                .eqIfPresent(UserDO::getName, "张三 1");
         List<UserDO> list2 = wrapper2.list();
         list2.forEach(System.out::println);
     }
diff --git a/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/UserDO.kt b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/UserDO.kt
index c2860e6..73f428c 100644
--- a/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/UserDO.kt
+++ b/mybatis-plus-join-test/test-kotlin/src/main/java/com/github/yulichang/test/kt/entity/UserDO.kt
@@ -52,4 +52,7 @@ open class UserDO : ID<Int?>(), Serializable {
 
     @TableField(exist = false)
     var addressList2: List<AddressDO>? = null
+    override fun toString(): String {
+        return "UserDO(pid=$pid, name=$name, json=$json, sex=$sex, img=$img, createTime=$createTime, addressId=$addressId, addressId2=$addressId2, del=$del, createBy=$createBy, createName=$createName, updateBy=$updateBy, updateName=$updateName, alias=$alias, children=$children, addressList=$addressList, addressList2=$addressList2)"
+    }
 }
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/LambdaWrapperTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/LambdaWrapperTest.kt
index 1be531a..ecb9835 100644
--- a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/LambdaWrapperTest.kt
+++ b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/LambdaWrapperTest.kt
@@ -734,7 +734,7 @@ class LambdaWrapperTest {
         assert(dos!!.size == 4)
 
         ThreadLocalUtils.set(
-                "SELECT id,pid,`name`,`json`,sex,head_img,create_time,address_id,address_id2,del,create_by,update_by FROM `user` t WHERE t.del=false AND (t.id > ? AND t.id < ?)",
+                "SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.id > ? AND t.id < ?)",
                 "SELECT * FROM `user` t WHERE t.del=false AND (t.id > ? AND t.id < ?) "
         )
         val dos1: MutableList<UserDO?>? = userMapper.selectList(
@@ -1009,7 +1009,7 @@ class LambdaWrapperTest {
     @Test
     fun joinOrder() {
         ThreadLocalUtils.set(
-                "SELECT id,user_id,name FROM order_t t ORDER BY t.name DESC",
+                "SELECT t.id, t.user_id, t.name FROM order_t t ORDER BY t.name DESC",
                 "SELECT id,user_id,name FROM order_t t ORDER BY t.name desc"
         )
         val wrapper: KtLambdaWrapper<OrderDO> = KtWrappers.query(OrderDO::class.java)
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt
index 78c94a8..550f236 100644
--- a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt
+++ b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt
@@ -26,7 +26,7 @@ class CustomWrapperTest {
     //自定义wrapper扩展
     class CWrapper<T> : KtLambdaWrapper<T>() {
 
-        fun eqIfAbsent(column: KProperty<*>, `val`: Any?): CWrapper<T> {
+        override fun eqIfPresent(column: KProperty<*>?, `val`: Any?): CWrapper<T> {
             eq(Objects.nonNull(`val`), column, `val`)
             return this
         }
@@ -42,16 +42,16 @@ class CustomWrapperTest {
     fun testWrapperCustomer() {
         ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.id = ?)")
         val wrapper: CWrapper<UserDO> = CWrapper<UserDO>()
-                .selectAll(UserDO::class.java)
-                .toChildren<CWrapper<UserDO>> { CWrapper.toCWrapper() }
-                .eqIfAbsent(UserDO::id, 1)
+            .selectAll(UserDO::class.java)
+            .toChildren<CWrapper<UserDO>> { CWrapper.toCWrapper() }
+            .eqIfPresent(UserDO::id, 1)
         val dos = userMapper?.selectList(wrapper)
         dos?.forEach(System.out::println)
         ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false")
         val wrapper1: CWrapper<UserDO> = CWrapper<UserDO>()
-                .selectAll(UserDO::class.java)
-                .toChildren(Ref<CWrapper<UserDO>>())
-                .eqIfAbsent(UserDO::id, null)
+            .selectAll(UserDO::class.java)
+            .toChildren(Ref<CWrapper<UserDO>>())
+            .eqIfPresent(UserDO::id, null)
         val dos1 = userMapper?.selectList(wrapper1)
         dos1?.forEach(System.out::println)
     }
diff --git a/mybatis-plus-join-test/test-springboot3-jdk17/src/main/resources/application.yml b/mybatis-plus-join-test/test-springboot3-jdk17/src/main/resources/application.yml
index 7f43c6c..2713cd3 100644
--- a/mybatis-plus-join-test/test-springboot3-jdk17/src/main/resources/application.yml
+++ b/mybatis-plus-join-test/test-springboot3-jdk17/src/main/resources/application.yml
@@ -25,4 +25,5 @@ mybatis-plus:
 mybatis-plus-join:
   banner: true
   sub-table-logic: true
-  ms-cache: true
\ No newline at end of file
+  ms-cache: true
+  logic-del-type: where
\ No newline at end of file

From fb3bf665454a77697005196c1023a8b3e2c76c0d Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 5 Jan 2024 12:37:33 +0800
Subject: [PATCH 56/88] =?UTF-8?q?=E5=8D=87=E7=BA=A7springboot=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test-springboot3-jdk17/pom.xml            | 51 ++++++++++++++++---
 1 file changed, 44 insertions(+), 7 deletions(-)

diff --git a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
index fbdd336..8f66fac 100644
--- a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
+++ b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
@@ -4,16 +4,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mybatis-plus-join-test</artifactId>
-        <groupId>com.github.yulichang</groupId>
-        <version>${revision}</version>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.2.1</version>
+        <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>test-springboot3-jdk17</artifactId>
 
     <properties>
-        <springboot.version>3.1.2</springboot.version>
+        <revision>1.4.9</revision>
+        <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
 
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
@@ -24,7 +26,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <version>${springboot.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -35,13 +36,49 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${springboot.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>2.2.224</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-boot-starter</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.16.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${mpj.mybatis.plus.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis-spring</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
+            <version>3.0.3</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
-            <version>6.0.5</version>
+            <version>6.1.2</version>
         </dependency>
 
         <dependency>

From 7f859b78d7020ecd4b9d6cfe92e45c20edb64e29 Mon Sep 17 00:00:00 2001
From: tuine <tuine@live.com>
Date: Wed, 10 Jan 2024 18:02:43 +0800
Subject: [PATCH 57/88] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E8=A1=A8=E6=98=AF=E5=90=A6=E5=B7=B2=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wrapper/JoinAbstractLambdaWrapper.java    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

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 0a2970d..61a7b05 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
@@ -368,6 +368,35 @@ public abstract class JoinAbstractLambdaWrapper<T, Children extends JoinAbstract
         return from.getStringValue();
     }
 
+    /**
+     * 检验表是否已连接
+     */
+    public boolean checkJoinTable(Class clazz) {
+        TableInfo info = TableHelper.get(clazz);
+        Asserts.hasTable(info, clazz);
+        String tableName = info.getTableName();
+
+        for (Children wrapper : onWrappers) {
+            if (StringUtils.isBlank(wrapper.from.getStringValue())) {
+                if (this.subLogicSql && this.logicDelType == LogicDelTypeEnum.ON) {
+                    TableInfo tableInfo = TableHelper.get(wrapper.getJoinClass());
+                    if (tableInfo != null && tableName.equals(tableInfo.getTableName())) {
+                        return true;
+                    }
+                }
+                if (wrapper.getTableName().equals(tableName)) {
+                    return true;
+                }
+            } else {
+                if (wrapper.from.getStringValue().contains(Constant.JOIN + StringPool.SPACE + tableName)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     /**
      * 内部调用, 不建议使用
      */

From 01e12d6a6f5a7b96ecf3bc284e67630da6c9ae24 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 15 Jan 2024 00:29:31 +0800
Subject: [PATCH 58/88] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=9B=B4=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/kt/interfaces/QueryLabel.java   |  4 +-
 .../yulichang/query/MPJQueryWrapper.java      |  2 +-
 .../yulichang/toolkit/JoinWrappers.java       |  6 +-
 .../github/yulichang/toolkit/MPJWrappers.java |  4 +-
 .../yulichang/wrapper/interfaces/Chain.java   | 81 +++++++------------
 .../yulichang/wrapper/interfaces/Compare.java |  2 +-
 .../wrapper/interfaces/QueryLabel.java        | 38 ++++-----
 7 files changed, 59 insertions(+), 78 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryLabel.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryLabel.java
index 931fd07..e450196 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryLabel.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/QueryLabel.java
@@ -32,7 +32,7 @@ public interface QueryLabel<Children> {
      * <p>
      * 举例 UserDO AddressDO 为一对多关系  UserDTO 为结果类
      * <pre>
-     *     MPJLambdaQueryWrapper<UserDO> wrapper = new MPJLambdaQueryWrapper<UserDO>();
+     *     MPJLambdaWrapper&lt;UserDO&gt; wrapper = new MPJLambdaWrapper&lt;UserDO&gt;();
      *     wrapper.selectAll(UserDO.class)
      *            .selectCollection(AddressDO.class, UserDTO::getAddressListDTO)
      *            .leftJoin(AddressDO.class, ...... )
@@ -71,7 +71,7 @@ public interface QueryLabel<Children> {
      * <p>
      * 举例 UserDO AddressDO 为一对多关系  UserDTO 为结果类
      * <pre>
-     *   MPJLambdaQueryWrapper<UserDO> wrapper = new MPJLambdaQueryWrapper();
+     *   MPJLambdaWrapper&lt;UserDO&gt; wrapper = new MPJLambdaWrapper();
      *   wrapper.selectAll(UserDO.class)
      *      .selectCollection(AddressDO.class, UserDTO::getAddressListDTO, map -> map
      *           .id(AddressDO::getId, AddressDTO::getId)                 //如果属性名一致 可以传一个
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
index a13cabb..a19a16f 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
 
 /**
  * copy {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
- * 推荐使用 JoinWrappers.<UserDO>queryJoin();构造
+ * 推荐使用 JoinWrappers.&lt;UserDO&gt;query();构造
  *
  * @author yulichang
  * @see com.github.yulichang.toolkit.JoinWrappers
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JoinWrappers.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JoinWrappers.java
index b2eac1e..35895ae 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JoinWrappers.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JoinWrappers.java
@@ -13,7 +13,7 @@ import com.github.yulichang.wrapper.UpdateJoinWrapper;
 public class JoinWrappers {
 
     /**
-     * JoinWrappers.<UserDO>query()
+     * JoinWrappers.&lt;UserDO&gt;query()
      */
     public static <T> MPJQueryWrapper<T> query() {
         return new MPJQueryWrapper<>();
@@ -34,14 +34,14 @@ public class JoinWrappers {
     }
 
     /**
-     * JoinWrappers.<UserDO>lambda()
+     * JoinWrappers.&lt;UserDO&gt;lambda()
      */
     public static <T> MPJLambdaWrapper<T> lambda() {
         return new MPJLambdaWrapper<>();
     }
 
     /**
-     * JoinWrappers.<UserDO>lambda("t")
+     * JoinWrappers.&lt;UserDO&gt;lambda("t")
      */
     public static <T> MPJLambdaWrapper<T> lambda(String alias) {
         return new MPJLambdaWrapper<>(alias);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJWrappers.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJWrappers.java
index 13abf50..ef034d8 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJWrappers.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJWrappers.java
@@ -13,7 +13,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 public class MPJWrappers {
 
     /**
-     * MPJWrappers.<UserDO>queryJoin()
+     * MPJWrappers.&lt;UserDO&gt;query()
      */
     public static <T> MPJQueryWrapper<T> queryJoin() {
         return new MPJQueryWrapper<>();
@@ -28,7 +28,7 @@ public class MPJWrappers {
     }
 
     /**
-     * MPJWrappers.<UserDO>lambdaJoin()
+     * MPJWrappers.&lt;UserDO&gt;lambda()
      */
     public static <T> MPJLambdaWrapper<T> lambdaJoin() {
         return new MPJLambdaWrapper<>();
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Chain.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Chain.java
index 404f8ba..5c15dc4 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Chain.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Chain.java
@@ -12,11 +12,10 @@ import java.util.List;
 
 /**
  * 链式调用
- * 构造方法必须传 class 或 entity 否则会报错
- * new MPJLambdaWrapper(User.class)
- * new MPJQueryWrapper(User.class)
- * JoinWrappers.\<User\>lambdaJoin(User.class)
- * JoinWrappers.\<User\>queryJoin(User.class)
+ * <p>
+ * 构造方法必须传 class 或 entity 否则会报错<br />
+ * new MPJLambdaWrapper(User.class)<br />
+ * JoinWrappers.lambda(User.class)<br />
  *
  * @author yulichang
  * @since 1.4.4
@@ -29,11 +28,9 @@ public interface Chain<T> {
     /**
      * 链式调用 等效于MP mapper的 selectCount()
      * <p>
-     * 构造方法必须传 class 或 entity 否则会报错
-     * new MPJLambdaWrapper(User.class)
-     * new MPJQueryWrapper(User.class)
-     * JoinWrappers.\<User\>lambdaJoin(User.class)
-     * JoinWrappers.\<User\>queryJoin(User.class)
+     * 构造方法必须传 class 或 entity 否则会报错 <br />
+     * new MPJLambdaWrapper(User.class)<br />
+     * JoinWrappers.lambda(User.class)<br />
      */
     default Long count() {
         return SqlHelper.exec(getEntityClass(), mapper -> {
@@ -45,11 +42,9 @@ public interface Chain<T> {
     /**
      * 链式调用 等效于 selectOne
      * <p>
-     * 构造方法必须传 class 或 entity 否则会报错
-     * new MPJLambdaWrapper(User.class)
-     * new MPJQueryWrapper(User.class)
-     * JoinWrappers.\<User\>lambdaJoin(User.class)
-     * JoinWrappers.\<User\>queryJoin(User.class)
+     * 构造方法必须传 class 或 entity 否则会报错<br />
+     * new MPJLambdaWrapper(User.class)<br />
+     * JoinWrappers.lambda(User.class)<br />
      */
     default T one() {
         return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectOne((Wrapper<T>) this));
@@ -58,11 +53,9 @@ public interface Chain<T> {
     /**
      * 链式调用 等效于 selectJoinOne
      * <p>
-     * 构造方法必须传 class 或 entity 否则会报错
-     * new MPJLambdaWrapper(User.class)
-     * new MPJQueryWrapper(User.class)
-     * JoinWrappers.\<User\>lambdaJoin(User.class)
-     * JoinWrappers.\<User\>queryJoin(User.class)
+     * 构造方法必须传 class 或 entity 否则会报错<br />
+     * new MPJLambdaWrapper(User.class)<br />
+     * JoinWrappers.lambda(User.class)<br />
      */
     default <R> R one(Class<R> resultType) {
         return SqlHelper.execJoin(getEntityClass(), mapper -> mapper.selectJoinOne(resultType, (MPJBaseJoin<T>) this));
@@ -71,11 +64,9 @@ public interface Chain<T> {
     /**
      * 链式调用 查询列表第一个 匹配多个不会抛异常
      * <p>
-     * 构造方法必须传 class 或 entity 否则会报错
-     * new MPJLambdaWrapper(User.class)
-     * new MPJQueryWrapper(User.class)
-     * JoinWrappers.\<User\>lambdaJoin(User.class)
-     * JoinWrappers.\<User\>queryJoin(User.class)
+     * 构造方法必须传 class 或 entity 否则会报错<br />
+     * new MPJLambdaWrapper(User.class)<br />
+     * JoinWrappers.lambda(User.class)<br />
      */
     default T first() {
         List<T> list = list();
@@ -85,11 +76,9 @@ public interface Chain<T> {
     /**
      * 链式调用 查询列表第一个 匹配多个不会抛异常
      * <p>
-     * 构造方法必须传 class 或 entity 否则会报错
-     * new MPJLambdaWrapper(User.class)
-     * new MPJQueryWrapper(User.class)
-     * JoinWrappers.\<User\>lambdaJoin(User.class)
-     * JoinWrappers.\<User\>queryJoin(User.class)
+     * 构造方法必须传 class 或 entity 否则会报错<br />
+     * new MPJLambdaWrapper(User.class)<br />
+     * JoinWrappers.lambda(User.class)<br />
      */
     default <R> R first(Class<R> resultType) {
         List<R> list = list(resultType);
@@ -98,11 +87,9 @@ public interface Chain<T> {
 
     /**
      * 链式调用
-     * 构造方法必须传 class 或 entity 否则会报错
-     * new MPJLambdaWrapper(User.class)
-     * new MPJQueryWrapper(User.class)
-     * JoinWrappers.\<User\>lambdaJoin(User.class)
-     * JoinWrappers.\<User\>queryJoin(User.class)
+     * 构造方法必须传 class 或 entity 否则会报错<br />
+     * new MPJLambdaWrapper(User.class)<br />
+     * JoinWrappers.lambda(User.class)<br />
      */
     default List<T> list() {
         return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectList((Wrapper<T>) this));
@@ -110,11 +97,9 @@ public interface Chain<T> {
 
     /**
      * 链式调用
-     * 构造方法必须传 class 或 entity 否则会报错
-     * new MPJLambdaWrapper(User.class)
-     * new MPJQueryWrapper(User.class)
-     * JoinWrappers.\<User\>lambdaJoin(User.class)
-     * JoinWrappers.\<User\>queryJoin(User.class)
+     * 构造方法必须传 class 或 entity 否则会报错<br />
+     * new MPJLambdaWrapper(User.class)<br />
+     * JoinWrappers.lambda(User.class)<br />
      */
     default <R> List<R> list(Class<R> resultType) {
         return SqlHelper.execJoin(getEntityClass(), mapper -> mapper.selectJoinList(resultType, (MPJBaseJoin<T>) this));
@@ -122,11 +107,9 @@ public interface Chain<T> {
 
     /**
      * 链式调用
-     * 构造方法必须传 class 或 entity 否则会报错
-     * new MPJLambdaWrapper(User.class)
-     * new MPJQueryWrapper(User.class)
-     * JoinWrappers.\<User\>lambdaJoin(User.class)
-     * JoinWrappers.\<User\>queryJoin(User.class)
+     * 构造方法必须传 class 或 entity 否则会报错<br />
+     * new MPJLambdaWrapper(User.class)<br />
+     * JoinWrappers.lambda(User.class)<br />
      */
     default <P extends IPage<T>> P page(P page) {
         return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectPage(page, (Wrapper<T>) this));
@@ -134,11 +117,9 @@ public interface Chain<T> {
 
     /**
      * 链式调用
-     * 构造方法必须传 class 或 entity 否则会报错
-     * new MPJLambdaWrapper(User.class)
-     * new MPJQueryWrapper(User.class)
-     * JoinWrappers.\<User\>lambdaJoin(User.class)
-     * JoinWrappers.\<User\>queryJoin(User.class)
+     * 构造方法必须传 class 或 entity 否则会报错<br />
+     * new MPJLambdaWrapper(User.class)<br />
+     * JoinWrappers.lambda(User.class)<br />
      */
     default <R, P extends IPage<R>> P page(P page, Class<R> resultType) {
         return SqlHelper.execJoin(getEntityClass(), mapper -> mapper.selectJoinPage(page, resultType, (MPJBaseJoin<T>) this));
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Compare.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Compare.java
index d514904..a9bd165 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Compare.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Compare.java
@@ -29,7 +29,7 @@ public interface Compare<Children> extends Serializable {
      *
      * @param condition   执行条件
      * @param params      map 类型的参数, key 是字段名, value 是字段值
-     * @param null2IsNull 是否参数为 null 自动执行 isNull 方法, false 则忽略这个字段\
+     * @param null2IsNull 是否参数为 null 自动执行 isNull 方法, false 则忽略这个字段
      * @return children
      */
     <R, V> Children allEq(boolean condition, Map<SFunction<R, ?>, V> params, boolean null2IsNull);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/QueryLabel.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/QueryLabel.java
index 0f0d6c0..b175059 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/QueryLabel.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/QueryLabel.java
@@ -28,18 +28,18 @@ public interface QueryLabel<Children> {
     Children getChildren();
 
     /**
-     * 一对多查询 调用此方法发必需要调用对应的 left join / right join ... 连表方法，否则会报错
+     * 一对多查询 调用此方法必需要调用对应的 left join / right join ... 连表方法，否则会报错
      * <p>
      * 举例 UserDO AddressDO 为一对多关系  UserDTO 为结果类
      * <pre>
-     *     MPJLambdaQueryWrapper<UserDO> wrapper = new MPJLambdaQueryWrapper<UserDO>();
+     *     MPJLambdaWrapper&lt;UserDO&gt; wrapper = new MPJLambdaWrapper&lt;UserDO&gt;();
      *     wrapper.selectAll(UserDO.class)
      *            .selectCollection(AddressDO.class, UserDTO::getAddressListDTO)
      *            .leftJoin(AddressDO.class, ...... )
      *            .eq(...)
      *            ...
      * <pre/>
-     * 会自动将 AddressDO类中相同属性的字段 以mybatis<collection>的方式映射到UserDTO.addressListDTO属性中
+     * 会自动将 AddressDO类中相同属性的字段 以mybatis&lt;collection&gt;的方式映射到UserDTO.addressListDTO属性中
      *
      * @since 1.3.0
      *
@@ -50,11 +50,11 @@ public interface QueryLabel<Children> {
      * @param <Z>      包装类集合泛型
      * @param <F>      包装类集合字段泛型
      */
-    default <S, C, Z, F extends java.util.Collection<?>> Children selectCollection(Class<C> child, SFunction<S, F> dtoField) {
+    default <S, C, Z, F extends Collection<?>> Children selectCollection(Class<C> child, SFunction<S, F> dtoField) {
         return selectCollection(null, child, dtoField);
     }
 
-    default <S, C, Z, F extends java.util.Collection<?>> Children selectCollection(String prefix, Class<C> child, SFunction<S, F> dtoField) {
+    default <S, C, Z, F extends Collection<?>> Children selectCollection(String prefix, Class<C> child, SFunction<S, F> dtoField) {
         String dtoFieldName = LambdaUtils.getName(dtoField);
         Class<S> dtoClass = LambdaUtils.getEntityClass(dtoField);
         Map<String, FieldCache> fieldMap = MPJReflectionKit.getFieldMap(dtoClass);
@@ -73,22 +73,22 @@ public interface QueryLabel<Children> {
     }
 
     /**
-     * 一对多查询 调用此方法发必需要调用对应的 left join / right join ... 连表方法，否则会报错
+     * 一对多查询 调用此方法必需要调用对应的 left join / right join ... 连表方法，否则会报错
      * <p>
      * 举例 UserDO AddressDO 为一对多关系  UserDTO 为结果类
      * <pre>
-     *   MPJLambdaQueryWrapper<UserDO> wrapper = new MPJLambdaQueryWrapper();
-     *   wrapper.selectAll(UserDO.class)
+     *   MPJLambdaWrapper&lt;UserDO&gt; wrapper = new MPJLambdaWrapper&lt;UserDO&gt;()
+     *      .selectAll(UserDO.class)
      *      .selectCollection(AddressDO.class, UserDTO::getAddressListDTO, map -> map
      *           .id(AddressDO::getId, AddressDTO::getId)                 //如果属性名一致 可以传一个
      *           .result(AddressDO::getUserId)                            //如果属性名一致 可以传一个
-     *           .result(AddressDO::getAddress, AddressDTO::getAddress))) //如果属性名一致 可以传一个
+     *           .result(AddressDO::getAddress, AddressDTO::getAddress))  //如果属性名一致 可以传一个
      *      .leftJoin(AddressDO.class, ...... )
      *      .eq(...)
      *      ...
      * <pre/>
      *
-     * 会自动将 AddressDO类中指定的字段 以mybatis<collection>的方式映射到UserDTO.addressListDTO属性中
+     * 会自动将 AddressDO类中指定的字段 以mybatis&lt;collection&gt;的方式映射到UserDTO.addressListDTO属性中
      *
      * @since 1.3.0
      *
@@ -100,14 +100,14 @@ public interface QueryLabel<Children> {
      * @param <Z>        包装类集合泛型
      * @param <F>        包装类集合字段泛型
      */
-    default <S, C, Z, F extends java.util.Collection<Z>> Children selectCollection(Class<C> child,
-                                                                                   SFunction<S, F> dtoField,
-                                                                                   MFunc<MybatisLabel.Builder<C, Z>> collection) {
+    default <S, C, Z, F extends Collection<Z>> Children selectCollection(Class<C> child,
+                                                                         SFunction<S, F> dtoField,
+                                                                         MFunc<MybatisLabel.Builder<C, Z>> collection) {
         return selectCollection(null, child, dtoField, collection);
     }
 
-    default <S, Z, F extends java.util.Collection<Z>> Children selectCollection(SFunction<S, F> dtoField,
-                                                                                MFunc<MybatisLabelFree.Builder<Z>> collection) {
+    default <S, Z, F extends Collection<Z>> Children selectCollection(SFunction<S, F> dtoField,
+                                                                      MFunc<MybatisLabelFree.Builder<Z>> collection) {
         //自由映射必须存在泛型Z
         String dtoFieldName = LambdaUtils.getName(dtoField);
         Class<S> dtoClass = LambdaUtils.getEntityClass(dtoField);
@@ -121,10 +121,10 @@ public interface QueryLabel<Children> {
         return getChildren();
     }
 
-    default <S, C, Z, F extends java.util.Collection<Z>> Children selectCollection(String prefix,
-                                                                                   Class<C> child,
-                                                                                   SFunction<S, F> dtoField,
-                                                                                   MFunc<MybatisLabel.Builder<C, Z>> collection) {
+    default <S, C, Z, F extends Collection<Z>> Children selectCollection(String prefix,
+                                                                         Class<C> child,
+                                                                         SFunction<S, F> dtoField,
+                                                                         MFunc<MybatisLabel.Builder<C, Z>> collection) {
         String dtoFieldName = LambdaUtils.getName(dtoField);
         Class<S> dtoClass = LambdaUtils.getEntityClass(dtoField);
         FieldCache field = MPJReflectionKit.getFieldMap(dtoClass).get(dtoFieldName);

From 15fefbd458df4f004e2480d667ada494302747cf Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 15 Jan 2024 00:41:22 +0800
Subject: [PATCH 59/88] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=9B=B4=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/github/yulichang/kt/KtLambdaWrapper.java     | 8 ++++----
 .../com/github/yulichang/wrapper/MPJLambdaWrapper.java    | 6 ++++--
 .../com/github/yulichang/wrapper/UpdateJoinWrapper.java   | 1 +
 .../github/yulichang/wrapper/resultmap/MybatisLabel.java  | 1 -
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
index 51f4eb6..000b94c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
@@ -224,14 +224,14 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
     /**
      * union
      * <p>
-     * 推荐使用 union(Class<U> clazz, Consumer<MPJLambdaWrapper<U>> consumer)
+     * 推荐使用 union(Class&lt;U&gt; clazz, Consumer&lt;MPJLambdaWrapper&lt;U&gt;&gt; consumer)
      * 例： wrapper.union(UserDO.class, union -> union.selectAll(UserDO.class))
      *
      * @see #union(Class, Consumer)
      * @deprecated union 不支持子查询
      */
     @Deprecated
-    @SuppressWarnings("DeprecatedIsStillUsed")
+    @SuppressWarnings("ALL")
     public final KtLambdaWrapper<T> union(KtLambdaWrapper<?>... wrappers) {
         StringBuilder sb = new StringBuilder();
         for (KtLambdaWrapper<?> wrapper : wrappers) {
@@ -272,14 +272,14 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
     /**
      * union
      * <p>
-     * 推荐使用 unionAll(Class<U> clazz, Consumer<MPJLambdaWrapper<U>> consumer)
+     * 推荐使用 unionAll(Class&lt;U&gt; clazz, Consumer&lt;MPJLambdaWrapper&lt;U&gt;&gt; consumer)
      * 例： wrapper.unionAll(UserDO.class, union -> union.selectAll(UserDO.class))
      *
      * @see #unionAll(Class, Consumer)
      * @deprecated union 不支持子查询
      */
     @Deprecated
-    @SuppressWarnings("DeprecatedIsStillUsed")
+    @SuppressWarnings("ALL")
     public final KtLambdaWrapper<T> unionAll(KtLambdaWrapper<?>... wrappers) {
         StringBuilder sb = new StringBuilder();
         for (KtLambdaWrapper<?> wrapper : wrappers) {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index 4a5bd01..7b6116c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -227,7 +227,8 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
     /**
      * union
      * <p>
-     * 推荐使用 union(Class<U> clazz, Consumer<MPJLambdaWrapper<U>> consumer)
+     * 推荐使用 union(Class&lt;U&gt; clazz, ConsumerConsumer&lt;MPJLambdaWrapper&lt;U&gt;&gt; consumer)
+     * <p>
      * 例： wrapper.union(UserDO.class, union -> union.selectAll(UserDO.class))
      *
      * @see #union(Class, Consumer)
@@ -275,7 +276,8 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
     /**
      * union
      * <p>
-     * 推荐使用 unionAll(Class<U> clazz, Consumer<MPJLambdaWrapper<U>> consumer)
+     * 推荐使用 unionAll(Class&lt;U&gt; clazz, Consumer&lt;MPJLambdaWrapper&lt;U&gt;&gt; consumer)
+     * <p>
      * 例： wrapper.unionAll(UserDO.class, union -> union.selectAll(UserDO.class))
      *
      * @see #unionAll(Class, Consumer)
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
index 405385d..36f221d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
@@ -129,6 +129,7 @@ public class UpdateJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, UpdateJoi
         return typedThis;
     }
 
+    @SuppressWarnings("DuplicatedCode")
     @Override
     public String getSqlSet() {
         if (StringUtils.isNotBlank(sqlSetStr.getStringValue())) {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java
index 3c0222b..f029fd1 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java
@@ -54,7 +54,6 @@ public class MybatisLabel<E, T> implements Label<T> {
         /**
          * 自动构建
          */
-        @SuppressWarnings("unchecked")
         public Builder(String index, String property, Class<E> entityClass, Class<?> javaType) {
             this.mybatisLabel = new MybatisLabel<>();
             mybatisLabel.property = property;

From a286bf811d730baf3a291c251b7676af46f64bf6 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Mon, 15 Jan 2024 01:13:00 +0800
Subject: [PATCH 60/88] solon

---
 .../mybatisplusjoin/solon/plugin/XPluginImpl.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
index 655dbc9..f39dc0c 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
@@ -49,7 +49,7 @@ public class XPluginImpl implements Plugin {
             }
         });
         // 读取配置
-        Prop prop = new Prop(context.cfg().getProp("mybatis-plus-join"));
+        Prop prop = new Prop(context.cfg());
         ConfigProperties.banner = prop.get("banner", Boolean::parseBoolean);
         ConfigProperties.subTableLogic = prop.get("subTableLogic", Boolean::parseBoolean);
         ConfigProperties.msCache = prop.get("msCache", Boolean::parseBoolean);
@@ -76,10 +76,12 @@ public class XPluginImpl implements Plugin {
 
         private final Properties props;
 
+        @SuppressWarnings("SpellCheckingInspection")
         public Prop(Props props) {
-            this.props = new Properties();
-            props.forEach((k, v) -> this.props.put(k.toString()
-                    .replaceAll("[-_]", "").toUpperCase(Locale.ENGLISH), v));
+            this.props = props.entrySet().stream().filter(e -> format(e.getKey().toString())
+                    .startsWith("MYBATISPLUSJOIN.")).collect(Collectors.toMap(e -> e.getKey().toString()
+                    .substring(e.getKey().toString().lastIndexOf(".") + 1)
+                    .toUpperCase(Locale.ENGLISH), Map.Entry::getValue, (o, n) -> n, Properties::new));
         }
 
         @SuppressWarnings("unchecked")
@@ -92,5 +94,9 @@ public class XPluginImpl implements Plugin {
                 throw new RuntimeException(e);
             }
         }
+
+        private String format(String key) {
+            return key.replaceAll("[-_]", "").toUpperCase(Locale.ENGLISH);
+        }
     }
 }
\ No newline at end of file

From fbce257571cb1e40e35ee821a7f2b3c019d93ee5 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Tue, 16 Jan 2024 13:08:23 +0800
Subject: [PATCH 61/88] 
 https://gitee.com/best_handsome/mybatis-plus-join/issues/I7OLR3#note_24413498_link

---
 mybatis-plus-join-solon-plugin/README.md      |  33 +++
 mybatis-plus-join-solon-plugin/pom.xml        |   8 +-
 .../solon/plugin/XPluginImpl.java             |  10 +-
 .../solon/plugin/base/JoinDeepService.java    | 244 ++++++++++++++++++
 .../plugin/base/JoinRelationService.java      |  61 +++++
 .../solon/plugin/base/JoinService.java        |  99 +++++++
 .../solon/plugin/base/JoinServiceImpl.java    |  13 +
 7 files changed, 456 insertions(+), 12 deletions(-)
 create mode 100644 mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinDeepService.java
 create mode 100644 mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinRelationService.java
 create mode 100644 mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinService.java
 create mode 100644 mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinServiceImpl.java

diff --git a/mybatis-plus-join-solon-plugin/README.md b/mybatis-plus-join-solon-plugin/README.md
index 6f8e809..2b12503 100644
--- a/mybatis-plus-join-solon-plugin/README.md
+++ b/mybatis-plus-join-solon-plugin/README.md
@@ -6,4 +6,37 @@
     <artifactId>mybatis-plus-join-solon-plugin</artifactId>
     <version>lastVersion</version>
 </dependency>
+```
+
+### mapper继承JoinBaseMapper
+
+```java
+import com.github.yulichang.base.MPJBaseMapper;
+
+@Mapper
+public interface UserMapper extends MPJBaseMapper<UserDO> {
+
+}
+```
+
+### (可选)service继承JoinBaseService
+
+```java
+import com.github.yulichang.mybatisplusjoin.solon.plugin.base.JoinService;
+
+public interface UserService extends JoinService<UserDO> {
+
+}
+```
+
+### (可选)serviceImpl继承JoinBaseServiceImpl
+
+```java
+import com.github.yulichang.mybatisplusjoin.solon.plugin.base.JoinServiceImpl;
+import org.noear.solon.annotation.Component;
+
+@Component
+public class UserServiceImpl extends JoinServiceImpl<UserMapper, UserDO> implements UserService {
+
+}
 ```
\ No newline at end of file
diff --git a/mybatis-plus-join-solon-plugin/pom.xml b/mybatis-plus-join-solon-plugin/pom.xml
index 5fd1732..b27d424 100644
--- a/mybatis-plus-join-solon-plugin/pom.xml
+++ b/mybatis-plus-join-solon-plugin/pom.xml
@@ -24,12 +24,6 @@
             <artifactId>mybatis-plus-join-extension</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-core</artifactId>
-            <version>${mpj.mybatis.plus.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon</artifactId>
@@ -44,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>org.noear</groupId>
-            <artifactId>mybatis-plus-solon-plugin</artifactId>
+            <artifactId>mybatis-plus-extension-solon-plugin</artifactId>
             <version>${solon.varrsion}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
index f39dc0c..7db2be8 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
@@ -76,10 +76,9 @@ public class XPluginImpl implements Plugin {
 
         private final Properties props;
 
-        @SuppressWarnings("SpellCheckingInspection")
         public Prop(Props props) {
-            this.props = props.entrySet().stream().filter(e -> format(e.getKey().toString())
-                    .startsWith("MYBATISPLUSJOIN.")).collect(Collectors.toMap(e -> e.getKey().toString()
+            this.props = props.entrySet().stream().filter(e -> format(e.getKey())
+                    .startsWith(format("mybatis-plus-join."))).collect(Collectors.toMap(e -> e.getKey().toString()
                     .substring(e.getKey().toString().lastIndexOf(".") + 1)
                     .toUpperCase(Locale.ENGLISH), Map.Entry::getValue, (o, n) -> n, Properties::new));
         }
@@ -95,8 +94,9 @@ public class XPluginImpl implements Plugin {
             }
         }
 
-        private String format(String key) {
-            return key.replaceAll("[-_]", "").toUpperCase(Locale.ENGLISH);
+        private String format(Object key) {
+            return Optional.ofNullable(key).map(k -> k.toString().replaceAll("[-_]", "")
+                    .toUpperCase(Locale.ENGLISH)).orElse("");
         }
     }
 }
\ No newline at end of file
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinDeepService.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinDeepService.java
new file mode 100644
index 0000000..70629e8
--- /dev/null
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinDeepService.java
@@ -0,0 +1,244 @@
+package com.github.yulichang.mybatisplusjoin.solon.plugin.base;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.solon.service.IService;
+import com.github.yulichang.annotation.EntityMapping;
+import com.github.yulichang.annotation.FieldMapping;
+import com.github.yulichang.extension.mapping.config.DeepConfig;
+import com.github.yulichang.extension.mapping.relation.Relation;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * 深度查询
+ * <p>
+ * 对配置了映射注解的字段进行查询
+ * 目前查询深度只支持2级(只解析当前实体类的映射注解,不会对查询结果再次解析注解)
+ * 多级查询可能存在循环引用的问题，也可能会导致全量查询
+ *
+ * @author yulichang
+ * @see EntityMapping
+ * @see FieldMapping
+ * @since 1.2.0
+ */
+@SuppressWarnings({"unused"})
+public interface JoinDeepService<T> extends IService<T> {
+
+    /**
+     * 根据 ID 查询 并关联全部映射
+     *
+     * @param id 主键ID
+     */
+    default T getByIdDeep(Serializable id) {
+        return Relation.mpjGetRelation(getById(id), DeepConfig.defaultConfig());
+    }
+
+    /**
+     * 根据 ID 查询 并关联指定映射
+     * <p>
+     * JDK 默认不推荐泛型数组，会引起 Java堆污染(Heap Pollution)
+     *
+     * @param id     主键ID
+     * @param config 映射配置
+     */
+    default <R> T getByIdDeep(Serializable id, Function<DeepConfig.Builder<T>, DeepConfig.Builder<T>> config) {
+        return Relation.mpjGetRelation(getById(id), config.apply(DeepConfig.builder()).build());
+    }
+
+    /**
+     * 针对可变参数堆污染提供的重载
+     * list为null或空，会查询全部映射关系
+     * <p>
+     * 例： selectByIdDeep(1, Arrays.asList(User::getId, ... ))
+     *
+     * @param id     主键ID
+     * @param config 映射配置
+     */
+    default <R> T getByIdDeep(Serializable id, DeepConfig<T> config) {
+        return Relation.mpjGetRelation(getById(id), config);
+    }
+
+    /**
+     * 查询（根据ID 批量查询）
+     *
+     * @param idList 主键ID列表(不能为 null 以及 empty)
+     */
+    default List<T> listByIdsDeep(Collection<? extends Serializable> idList) {
+        return Relation.mpjGetRelation(listByIds(idList), DeepConfig.defaultConfig());
+    }
+
+    /**
+     * 查询（根据ID 批量查询）
+     * <p>
+     * JDK 默认不推荐泛型数组，会引起 Java堆污染(Heap Pollution)
+     *
+     * @param idList 主键ID列表(不能为 null 以及 empty)
+     * @param config 映射配置
+     */
+    default <R> List<T> listByIdsDeep(Collection<? extends Serializable> idList, Function<DeepConfig.Builder<T>, DeepConfig.Builder<T>> config) {
+        return Relation.mpjGetRelation(listByIds(idList), config.apply(DeepConfig.builder()).build());
+    }
+
+    /**
+     * 针对可变参数堆污染提供的重载
+     * list为null或空，会查询全部映射关系
+     * <p>
+     * 例： selectBatchIdsDeep(idList, Arrays.asList(User::getId, ... ))
+     *
+     * @param idList 主键ID列表(不能为 null 以及 empty)
+     * @param config 映射配置
+     */
+    default <R> List<T> listByIdsDeep(Collection<? extends Serializable> idList, DeepConfig<T> config) {
+        return Relation.mpjGetRelation(listByIds(idList), config);
+    }
+
+    /**
+     * 查询（根据 columnMap 条件）
+     *
+     * @param columnMap 表字段 map 对象
+     */
+    default List<T> listByMapDeep(Map<String, Object> columnMap) {
+        return Relation.mpjGetRelation(listByMap(columnMap), DeepConfig.defaultConfig());
+    }
+
+    /**
+     * 查询（根据 columnMap 条件）
+     * <p>
+     * JDK 默认不推荐泛型数组，会引起 Java堆污染(Heap Pollution)
+     *
+     * @param columnMap 表字段 map 对象
+     * @param config    映射配置
+     */
+    default <R> List<T> listByMapDeep(Map<String, Object> columnMap, Function<DeepConfig.Builder<T>, DeepConfig.Builder<T>> config) {
+        return Relation.mpjGetRelation(listByMap(columnMap), config.apply(DeepConfig.builder()).build());
+    }
+
+    /**
+     * 针对可变参数堆污染提供的重载
+     * list为null或空，会查询全部映射关系
+     * <p>
+     * 例： selectByMapDeep(columnMap, Arrays.asList(User::getId, ... ))
+     *
+     * @param columnMap 表字段 map 对象
+     * @param config    映射配置
+     */
+    default <R> List<T> listByMapDeep(Map<String, Object> columnMap, DeepConfig<T> config) {
+        return Relation.mpjGetRelation(listByMap(columnMap), config);
+    }
+
+    /**
+     * 根据 entity 条件，查询一条记录
+     *
+     * @param queryWrapper 实体对象封装操作类（可以为 null）
+     */
+    default T getOneDeep(Wrapper<T> queryWrapper) {
+        return Relation.mpjGetRelation(getOne(queryWrapper), DeepConfig.defaultConfig());
+    }
+
+    /**
+     * 根据 entity 条件，查询一条记录
+     * <p>
+     * JDK 默认不推荐泛型数组，会引起 Java堆污染(Heap Pollution)
+     *
+     * @param queryWrapper 实体对象封装操作类（可以为 null）
+     * @param config       映射配置
+     */
+    default <R> T getOneDeep(Wrapper<T> queryWrapper, Function<DeepConfig.Builder<T>, DeepConfig.Builder<T>> config) {
+        return Relation.mpjGetRelation(getOne(queryWrapper), config.apply(DeepConfig.builder()).build());
+    }
+
+    /**
+     * 针对可变参数堆污染提供的重载
+     * list为null或空，会查询全部映射关系
+     * <p>
+     * 例： selectOneDeep(queryWrapper, Arrays.asList(User::getId, ... ))
+     *
+     * @param queryWrapper 实体对象封装操作类（可以为 null）
+     * @param config       映射配置
+     */
+    default <R> T getOneDeep(Wrapper<T> queryWrapper, DeepConfig<T> config) {
+        return Relation.mpjGetRelation(getOne(queryWrapper), config);
+    }
+
+    /**
+     * 根据 entity 条件，查询全部记录
+     *
+     * @param queryWrapper 实体对象封装操作类（可以为 null）
+     */
+    default List<T> listDeep(Wrapper<T> queryWrapper) {
+        return Relation.mpjGetRelation(list(queryWrapper), DeepConfig.defaultConfig());
+    }
+
+    /**
+     * 根据 entity 条件，查询全部记录
+     * <p>
+     * JDK 默认不推荐泛型数组，会引起 Java堆污染(Heap Pollution)
+     *
+     * @param queryWrapper 实体对象封装操作类（可以为 null）
+     * @param config       映射配置
+     */
+    default <R> List<T> listDeep(Wrapper<T> queryWrapper, Function<DeepConfig.Builder<T>, DeepConfig.Builder<T>> config) {
+        return Relation.mpjGetRelation(list(queryWrapper), config.apply(DeepConfig.builder()).build());
+    }
+
+    /**
+     * 针对可变参数堆污染提供的重载
+     * list为null或空，会查询全部映射关系
+     * <p>
+     * 例： selectListDeep(queryWrapper, Arrays.asList(User::getId, ... ))
+     *
+     * @param queryWrapper 实体对象封装操作类（可以为 null）
+     * @param config       映射配置
+     */
+    default <R> List<T> listDeep(Wrapper<T> queryWrapper, DeepConfig<T> config) {
+        return Relation.mpjGetRelation(list(queryWrapper), config);
+    }
+
+    /**
+     * 根据 entity 条件，查询全部记录（并翻页）
+     *
+     * @param page         分页查询条件（可以为 RowBounds.DEFAULT）
+     * @param queryWrapper 实体对象封装操作类（可以为 null）
+     */
+    default <E extends IPage<T>> E pageDeep(E page, Wrapper<T> queryWrapper) {
+        E e = page(page, queryWrapper);
+        Relation.mpjGetRelation(e.getRecords(), DeepConfig.defaultConfig());
+        return e;
+    }
+
+    /**
+     * 根据 entity 条件，查询全部记录（并翻页）
+     * <p>
+     * JDK 默认不推荐泛型数组，会引起 Java堆污染(Heap Pollution)
+     *
+     * @param page         分页查询条件（可以为 RowBounds.DEFAULT）
+     * @param queryWrapper 实体对象封装操作类（可以为 null）
+     * @param config       映射配置
+     */
+    default <R, E extends IPage<T>> E pageDeep(E page, Wrapper<T> queryWrapper, Function<DeepConfig.Builder<T>, DeepConfig.Builder<T>> config) {
+        E e = page(page, queryWrapper);
+        Relation.mpjGetRelation(e.getRecords(), config.apply(DeepConfig.builder()).build());
+        return e;
+    }
+
+    /**
+     * 针对可变参数堆污染提供的重载
+     * list为null或空，会查询全部映射关系
+     * <p>
+     * 例： selectPageDeep(page, queryWrapper, Arrays.asList(User::getId, ... ))
+     *
+     * @param page         分页查询条件（可以为 RowBounds.DEFAULT）
+     * @param queryWrapper 实体对象封装操作类（可以为 null）
+     * @param config       映射配置
+     */
+    default <R, E extends IPage<T>> E pageDeep(E page, Wrapper<T> queryWrapper, DeepConfig<T> config) {
+        E e = page(page, queryWrapper);
+        Relation.mpjGetRelation(e.getRecords(), config);
+        return e;
+    }
+}
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinRelationService.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinRelationService.java
new file mode 100644
index 0000000..8d76afe
--- /dev/null
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinRelationService.java
@@ -0,0 +1,61 @@
+package com.github.yulichang.mybatisplusjoin.solon.plugin.base;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.solon.service.IService;
+import com.github.yulichang.annotation.EntityMapping;
+import com.github.yulichang.annotation.FieldMapping;
+import com.github.yulichang.extension.mapping.config.DeepConfig;
+import com.github.yulichang.extension.mapping.relation.Relation;
+
+import java.util.function.Function;
+
+/**
+ * 深度查询
+ * <p>
+ * 对配置了映射注解的字段进行查询
+ * 目前查询深度只支持2级(只解析当前实体类的映射注解,不会对查询结果再次解析注解)
+ * 多级查询可能存在循环引用的问题，也可能会导致全量查询
+ * 用于替换deep
+ *
+ * @author yulichang
+ * @see EntityMapping
+ * @see FieldMapping
+ * @since 1.4.4
+ */
+@SuppressWarnings({"unchecked", "unused"})
+public interface JoinRelationService<T> extends IService<T> {
+
+    /**
+     * 通过注解实现单表多次查询
+     *
+     * @param function BaseMapper调用方法
+     * @see EntityMapping
+     * @see FieldMapping
+     */
+    default <R, M extends BaseMapper<T>> R getRelation(Function<M, R> function) {
+        return Relation.mpjGetRelation(function.apply((M) getBaseMapper()), DeepConfig.defaultConfig());
+    }
+
+    /**
+     * 通过注解实现单表多次查询
+     *
+     * @param function BaseMapper调用方法
+     * @see EntityMapping
+     * @see FieldMapping
+     */
+    default <R, M extends BaseMapper<T>> R getRelation(Function<M, R> function, DeepConfig<T> config) {
+        return Relation.mpjGetRelation(function.apply((M) getBaseMapper()), config);
+    }
+
+    /**
+     * 通过注解实现单表多次查询
+     *
+     * @param function BaseMapper调用方法
+     * @param config   映射配置
+     * @see EntityMapping
+     * @see FieldMapping
+     */
+    default <R, M extends BaseMapper<T>> R getRelation(Function<M, R> function, Function<DeepConfig.Builder<T>, DeepConfig.Builder<T>> config) {
+        return Relation.mpjGetRelation(function.apply((M) getBaseMapper()), config.apply(DeepConfig.builder()).build());
+    }
+}
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinService.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinService.java
new file mode 100644
index 0000000..13af811
--- /dev/null
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinService.java
@@ -0,0 +1,99 @@
+package com.github.yulichang.mybatisplusjoin.solon.plugin.base;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.solon.service.IService;
+import com.baomidou.mybatisplus.solon.toolkit.SqlHelper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.github.yulichang.interfaces.MPJBaseJoin;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 基础service
+ * 目前包含两个模块 连表查询 和 关系映射
+ *
+ * @author yulichang
+ */
+@SuppressWarnings({"unused"})
+public interface JoinService<T> extends IService<T> {
+
+
+    /**
+     * 根据 Wrapper 条件，连表删除
+     *
+     * @param wrapper joinWrapper
+     */
+    default boolean deleteJoin(MPJBaseJoin<T> wrapper) {
+        return SqlHelper.retBool(((MPJBaseMapper<T>) getBaseMapper()).deleteJoin(wrapper));
+    }
+
+    /**
+     * 根据 whereEntity 条件，更新记录
+     *
+     * @param entity  实体对象 (set 条件值,可以为 null)
+     * @param wrapper 实体对象封装操作类（可以为 null,里面的 entity 用于生成 where 语句）
+     */
+    default boolean updateJoin(T entity, MPJBaseJoin<T> wrapper) {
+        return SqlHelper.retBool(((MPJBaseMapper<T>) getBaseMapper()).updateJoin(entity, wrapper));
+    }
+
+    /**
+     * 根据 whereEntity 条件，更新记录 (null字段也会更新 !!!)
+     *
+     * @param entity  实体对象 (set 条件值,可以为 null)
+     * @param wrapper 实体对象封装操作类（可以为 null,里面的 entity 用于生成 where 语句）
+     */
+    default boolean updateJoinAndNull(T entity, MPJBaseJoin<T> wrapper) {
+        return SqlHelper.retBool(((MPJBaseMapper<T>) getBaseMapper()).updateJoinAndNull(entity, wrapper));
+    }
+
+    /**
+     * 根据 Wrapper 条件，查询总记录数
+     */
+    default Long selectJoinCount(MPJBaseJoin<T> wrapper) {
+        return ((MPJBaseMapper<T>) getBaseMapper()).selectJoinCount(wrapper);
+    }
+
+    /**
+     * 连接查询返回一条记录
+     */
+    default <DTO> DTO selectJoinOne(Class<DTO> clazz, MPJBaseJoin<T> wrapper) {
+        return ((MPJBaseMapper<T>) getBaseMapper()).selectJoinOne(clazz, wrapper);
+    }
+
+    /**
+     * 连接查询返回集合
+     */
+    default <DTO> List<DTO> selectJoinList(Class<DTO> clazz, MPJBaseJoin<T> wrapper) {
+        return ((MPJBaseMapper<T>) getBaseMapper()).selectJoinList(clazz, wrapper);
+    }
+
+    /**
+     * 连接查询返回集合并分页
+     */
+    default <DTO, P extends IPage<DTO>> P selectJoinListPage(P page, Class<DTO> clazz, MPJBaseJoin<T> wrapper) {
+        return ((MPJBaseMapper<T>) getBaseMapper()).selectJoinPage(page, clazz, wrapper);
+    }
+
+    /**
+     * 连接查询返回Map
+     */
+    default Map<String, Object> selectJoinMap(MPJBaseJoin<T> wrapper) {
+        return ((MPJBaseMapper<T>) getBaseMapper()).selectJoinMap(wrapper);
+    }
+
+    /**
+     * 连接查询返回Map集合
+     */
+    default List<Map<String, Object>> selectJoinMaps(MPJBaseJoin<T> wrapper) {
+        return ((MPJBaseMapper<T>) getBaseMapper()).selectJoinMaps(wrapper);
+    }
+
+    /**
+     * 连接查询返回Map集合并分页
+     */
+    default <P extends IPage<Map<String, Object>>> P selectJoinMapsPage(P page, MPJBaseJoin<T> wrapper) {
+        return ((MPJBaseMapper<T>) getBaseMapper()).selectJoinMapsPage(page, wrapper);
+    }
+}
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinServiceImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinServiceImpl.java
new file mode 100644
index 0000000..6d577b0
--- /dev/null
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinServiceImpl.java
@@ -0,0 +1,13 @@
+package com.github.yulichang.mybatisplusjoin.solon.plugin.base;
+
+import com.baomidou.mybatisplus.solon.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseMapper;
+
+/**
+ * @author yulichang
+ * @see ServiceImpl
+ */
+@SuppressWarnings("unused")
+public class JoinServiceImpl<M extends MPJBaseMapper<T>, T> extends ServiceImpl<M, T> implements JoinService<T> {
+
+}

From 185d92f05443e0ef80efb9b2e9559ed2c7c1cebc Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Tue, 16 Jan 2024 13:10:19 +0800
Subject: [PATCH 62/88] solon

---
 mybatis-plus-join-solon-plugin/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mybatis-plus-join-solon-plugin/README.md b/mybatis-plus-join-solon-plugin/README.md
index 2b12503..adacad7 100644
--- a/mybatis-plus-join-solon-plugin/README.md
+++ b/mybatis-plus-join-solon-plugin/README.md
@@ -8,7 +8,7 @@
 </dependency>
 ```
 
-### mapper继承JoinBaseMapper
+### mapper继承MPJBaseMapper
 
 ```java
 import com.github.yulichang.base.MPJBaseMapper;
@@ -19,7 +19,7 @@ public interface UserMapper extends MPJBaseMapper<UserDO> {
 }
 ```
 
-### (可选)service继承JoinBaseService
+### (可选)service继承JoinService
 
 ```java
 import com.github.yulichang.mybatisplusjoin.solon.plugin.base.JoinService;
@@ -29,7 +29,7 @@ public interface UserService extends JoinService<UserDO> {
 }
 ```
 
-### (可选)serviceImpl继承JoinBaseServiceImpl
+### (可选)serviceImpl继承JoinServiceImpl
 
 ```java
 import com.github.yulichang.mybatisplusjoin.solon.plugin.base.JoinServiceImpl;

From 48c1b6e8a1f6f496561c778643d0b9401dcab3bc Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Tue, 16 Jan 2024 19:38:45 +0800
Subject: [PATCH 63/88] solon

---
 mybatis-plus-join-solon-plugin/README.md                  | 8 ++++----
 .../plugin/base/{JoinService.java => MPJBaseService.java} | 2 +-
 .../{JoinServiceImpl.java => MPJBaseServiceImpl.java}     | 2 +-
 .../base/{JoinDeepService.java => MPJDeepService.java}    | 2 +-
 .../{JoinRelationService.java => MPJRelationService.java} | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/{JoinService.java => MPJBaseService.java} (98%)
 rename mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/{JoinServiceImpl.java => MPJBaseServiceImpl.java} (68%)
 rename mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/{JoinDeepService.java => MPJDeepService.java} (99%)
 rename mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/{JoinRelationService.java => MPJRelationService.java} (97%)

diff --git a/mybatis-plus-join-solon-plugin/README.md b/mybatis-plus-join-solon-plugin/README.md
index adacad7..1719943 100644
--- a/mybatis-plus-join-solon-plugin/README.md
+++ b/mybatis-plus-join-solon-plugin/README.md
@@ -22,9 +22,9 @@ public interface UserMapper extends MPJBaseMapper<UserDO> {
 ### (可选)service继承JoinService
 
 ```java
-import com.github.yulichang.mybatisplusjoin.solon.plugin.base.JoinService;
+import com.github.yulichang.mybatisplusjoin.solon.plugin.base.MPJBaseService;
 
-public interface UserService extends JoinService<UserDO> {
+public interface UserService extends MPJBaseService<UserDO> {
 
 }
 ```
@@ -32,11 +32,11 @@ public interface UserService extends JoinService<UserDO> {
 ### (可选)serviceImpl继承JoinServiceImpl
 
 ```java
-import com.github.yulichang.mybatisplusjoin.solon.plugin.base.JoinServiceImpl;
+import com.github.yulichang.mybatisplusjoin.solon.plugin.base.MPJBaseServiceImpl;
 import org.noear.solon.annotation.Component;
 
 @Component
-public class UserServiceImpl extends JoinServiceImpl<UserMapper, UserDO> implements UserService {
+public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, UserDO> implements UserService {
 
 }
 ```
\ No newline at end of file
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinService.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseService.java
similarity index 98%
rename from mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinService.java
rename to mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseService.java
index 13af811..7074f5f 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinService.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseService.java
@@ -16,7 +16,7 @@ import java.util.Map;
  * @author yulichang
  */
 @SuppressWarnings({"unused"})
-public interface JoinService<T> extends IService<T> {
+public interface MPJBaseService<T> extends IService<T> {
 
 
     /**
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinServiceImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseServiceImpl.java
similarity index 68%
rename from mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinServiceImpl.java
rename to mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseServiceImpl.java
index 6d577b0..90201d3 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinServiceImpl.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJBaseServiceImpl.java
@@ -8,6 +8,6 @@ import com.github.yulichang.base.MPJBaseMapper;
  * @see ServiceImpl
  */
 @SuppressWarnings("unused")
-public class JoinServiceImpl<M extends MPJBaseMapper<T>, T> extends ServiceImpl<M, T> implements JoinService<T> {
+public class MPJBaseServiceImpl<M extends MPJBaseMapper<T>, T> extends ServiceImpl<M, T> implements MPJBaseService<T> {
 
 }
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinDeepService.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJDeepService.java
similarity index 99%
rename from mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinDeepService.java
rename to mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJDeepService.java
index 70629e8..50524ba 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinDeepService.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJDeepService.java
@@ -27,7 +27,7 @@ import java.util.function.Function;
  * @since 1.2.0
  */
 @SuppressWarnings({"unused"})
-public interface JoinDeepService<T> extends IService<T> {
+public interface MPJDeepService<T> extends IService<T> {
 
     /**
      * 根据 ID 查询 并关联全部映射
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinRelationService.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJRelationService.java
similarity index 97%
rename from mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinRelationService.java
rename to mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJRelationService.java
index 8d76afe..0af851f 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/JoinRelationService.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/base/MPJRelationService.java
@@ -23,7 +23,7 @@ import java.util.function.Function;
  * @since 1.4.4
  */
 @SuppressWarnings({"unchecked", "unused"})
-public interface JoinRelationService<T> extends IService<T> {
+public interface MPJRelationService<T> extends IService<T> {
 
     /**
      * 通过注解实现单表多次查询

From 0475d410d0fbc892b322da2d5e3d0ec518dca074 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 17 Jan 2024 02:17:26 +0800
Subject: [PATCH 64/88] fix
 https://gitee.com/best_handsome/mybatis-plus-join/issues/I8WPCL
 https://gitee.com/best_handsome/mybatis-plus-join/issues/I8WP8Q
 https://gitee.com/best_handsome/mybatis-plus-join/issues/I83IEV
 https://github.com/yulichang/mybatis-plus-join/issues/89

---
 .../yulichang/annotation/EntityMapping.java   |  2 +-
 .../yulichang/interceptor/MPJInterceptor.java | 32 +++++++----
 .../github/yulichang/kt/KtLambdaWrapper.java  |  2 +-
 .../github/yulichang/kt/interfaces/Query.java |  8 +--
 .../yulichang/toolkit/JSqlParserHelper.java   | 55 +++++++++++++++++++
 .../yulichang/toolkit/ThrowOptional.java      |  8 ++-
 .../yulichang/wrapper/MPJLambdaWrapper.java   |  3 +-
 .../yulichang/wrapper/interfaces/Query.java   |  9 ++-
 .../wrapper/interfaces/SelectWrapper.java     |  4 ++
 .../wrapper/segments/SelectString.java        | 18 +++---
 .../yulichang/wrapper/segments/SelectSub.java | 10 +++-
 .../test/join/LambdaWrapperTest.java          |  9 ++-
 .../test/join/m/StringColumTest.java          | 48 ++++++++++++++++
 13 files changed, 165 insertions(+), 43 deletions(-)
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JSqlParserHelper.java
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/StringColumTest.java

diff --git a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java
index fa47e6b..74e30ef 100644
--- a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java
+++ b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java
@@ -10,7 +10,7 @@ import java.lang.annotation.*;
  * @since 1.2.0
  */
 @Documented
-@SuppressWarnings({"unused"})
+@SuppressWarnings("unused")
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
 public @interface EntityMapping {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
index 0eea4f3..9f20dfe 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
@@ -2,15 +2,13 @@ package com.github.yulichang.interceptor;
 
 import com.baomidou.mybatisplus.core.MybatisPlusVersion;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.interfaces.MPJBaseJoin;
 import com.github.yulichang.query.MPJQueryWrapper;
-import com.github.yulichang.toolkit.Constant;
-import com.github.yulichang.toolkit.MPJReflectionKit;
-import com.github.yulichang.toolkit.MPJTableMapperHelper;
-import com.github.yulichang.toolkit.TableHelper;
+import com.github.yulichang.toolkit.*;
 import com.github.yulichang.toolkit.support.FieldCache;
 import com.github.yulichang.wrapper.interfaces.SelectWrapper;
 import com.github.yulichang.wrapper.resultmap.IResult;
@@ -50,7 +48,7 @@ public class MPJInterceptor implements Interceptor {
     private static final List<ResultMapping> EMPTY_RESULT_MAPPING = new ArrayList<>(0);
 
     /**
-     * 缓存MappedStatement,不需要每次都去重新构建MappedStatement
+     * 缓存MappedStatement,不需要每次都去构建MappedStatement
      */
     private static final Map<String, Map<Configuration, MappedStatement>> MS_CACHE = new ConcurrentHashMap<>();
 
@@ -199,11 +197,23 @@ public class MPJInterceptor implements Interceptor {
                 }
             } else {
                 FieldCache field = fieldMap.get(i.getColumProperty());
-                columnSet.add(i.getTagColumn());
-                if (Objects.nonNull(field)) {
-                    ResultMapping.Builder builder = new ResultMapping.Builder(ms.getConfiguration(), i.getColumProperty(),
-                            i.getTagColumn(), field.getType());
-                    resultMappings.add(selectToResult(wrapper.getEntityClass(), i, field.getType(), builder));
+                if (StringUtils.isNotBlank(i.getTagColumn())) {
+                    columnSet.add(i.getTagColumn());
+                    if (Objects.nonNull(field)) {
+                        ResultMapping.Builder builder = new ResultMapping.Builder(ms.getConfiguration(), i.getColumProperty(),
+                                i.getTagColumn(), field.getType());
+                        resultMappings.add(selectToResult(wrapper.getEntityClass(), i, field.getType(), builder));
+                    }
+                } else if (wrapper.isResultMap()) {
+                    ThrowOptional.tryDo(() -> JSqlParserHelper.paresColum(wrapper, i.getColumn(), col -> {
+                        FieldCache strField = fieldMap.get(col);
+                        columnSet.add(col);
+                        if (Objects.nonNull(strField)) {
+                            ResultMapping.Builder builder = new ResultMapping.Builder(ms.getConfiguration(), col,
+                                    col, strField.getType());
+                            resultMappings.add(selectToResult(wrapper.getEntityClass(), i, strField.getType(), builder));
+                        }
+                    })).catchDo();
                 }
             }
         }
@@ -430,7 +440,7 @@ public class MPJInterceptor implements Interceptor {
     public void setProperties(Properties properties) {
         try {
             Interceptor.super.setProperties(properties);
-        } catch (Exception ignored) {
+        } catch (Throwable ignored) {
         }
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
index 000b94c..7c65b76 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtLambdaWrapper.java
@@ -217,7 +217,7 @@ public class KtLambdaWrapper<T> extends KtAbstractLambdaWrapper<T, KtLambdaWrapp
         consumer.accept(wrapper);
         addCustomWrapper(wrapper);
         this.selectColumns.add(new SelectSub(() -> KtWrapperUtils.buildSubSqlByWrapper(
-                clazz, wrapper, alias.getName()), hasAlias, this.alias));
+                clazz, wrapper, alias.getName()), hasAlias, this.alias, alias.getName()));
         return typedThis;
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
index 77c5a85..33729fe 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
@@ -90,7 +90,8 @@ public interface Query<Children> extends Serializable {
      * @param columns 列
      */
     default Children select(String... columns) {
-        getSelectColum().addAll(Arrays.stream(columns).map(i -> new SelectString(i, isHasAlias(), getAlias())).collect(Collectors.toList()));
+        getSelectColum().addAll(Arrays.stream(columns).map(i ->
+                new SelectString(i, null)).collect(Collectors.toList()));
         return getChildren();
     }
 
@@ -100,7 +101,7 @@ public interface Query<Children> extends Serializable {
      * @param column 列
      */
     default Children selectAs(String column, KProperty<?> alias) {
-        getSelectColum().add(new SelectString(column + Constants.AS + alias.getName(), isHasAlias(), getAlias()));
+        getSelectColum().add(new SelectString(column + Constants.AS + alias.getName(), alias.getName()));
         return getChildren();
     }
 
@@ -113,8 +114,7 @@ public interface Query<Children> extends Serializable {
         Map<String, SelectCache> cacheMap = ColumnCache.getMapField(KtUtils.ref(column));
         SelectCache cache = cacheMap.get(column.getName());
         getSelectColum().add(new SelectString(
-                index + Constants.DOT + cache.getColumn() + Constants.AS + alias.getName(),
-                isHasAlias(), getAlias()));
+                index + Constants.DOT + cache.getColumn() + Constants.AS + alias.getName(), alias.getName()));
         return getChildren();
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JSqlParserHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JSqlParserHelper.java
new file mode 100644
index 0000000..3473d84
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JSqlParserHelper.java
@@ -0,0 +1,55 @@
+package com.github.yulichang.toolkit;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.yulichang.wrapper.interfaces.SelectWrapper;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.select.*;
+
+import java.util.function.Consumer;
+
+/**
+ * @author yulichang
+ * @since 1.4.10
+ */
+public final class JSqlParserHelper {
+
+    /**
+     * 解析sql select字段 刚接触JSqlParser有更好的用法欢迎PR
+     *
+     * @param selectSql     要解析的select sql片段
+     * @param columConsumer 解析的字段处理
+     */
+    public static void paresColum(SelectWrapper<?, ?> wrapper, String selectSql, Consumer<String> columConsumer) throws Exception {
+        Statement statement = CCJSqlParserUtil.parse(String.format("SELECT %s FROM table %s %s", selectSql, wrapper.getAlias(), wrapper.getFrom()));
+        if (statement instanceof Select) {
+            Select select = (Select) statement;
+            SelectBody selectBody = select.getSelectBody();
+            if (selectBody instanceof PlainSelect) {
+                PlainSelect plainSelect = (PlainSelect) selectBody;
+                if (CollectionUtils.isNotEmpty(plainSelect.getSelectItems())) {
+                    for (SelectItem item : plainSelect.getSelectItems()) {
+                        if (item instanceof SelectExpressionItem) {
+                            String col;
+                            SelectExpressionItem selectExpressionItem = (SelectExpressionItem) item;
+                            if (null == selectExpressionItem.getAlias()) {
+                                if (selectExpressionItem.getExpression() instanceof Column) {
+                                    col = StringUtils.getTargetColumn(((Column) selectExpressionItem.getExpression()).getColumnName());
+                                } else {
+                                    col = StringUtils.getTargetColumn(selectExpressionItem.getExpression().toString());
+                                }
+                            } else {
+                                col = StringUtils.getTargetColumn(selectExpressionItem.getAlias().getName());
+                            }
+                            if (StringUtils.isNotBlank(col)) {
+                                columConsumer.accept(col);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/ThrowOptional.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/ThrowOptional.java
index f0fcc39..da86173 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/ThrowOptional.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/ThrowOptional.java
@@ -33,7 +33,11 @@ public class ThrowOptional {
         try {
             this.doSomething.doSomething();
         } catch (Throwable ignored) {
-            doSomething.doSomething();
+            try {
+                doSomething.doSomething();
+            } catch (Throwable e) {
+                throw new RuntimeException(e);
+            }
         }
     }
 
@@ -48,6 +52,6 @@ public class ThrowOptional {
 
     @FunctionalInterface
     public interface DoSomething {
-        void doSomething();
+        void doSomething() throws Throwable;
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index 7b6116c..137e5c5 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -220,7 +220,8 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
         wrapper.subTableAlias = st;
         consumer.accept(wrapper);
         addCustomWrapper(wrapper);
-        this.selectColumns.add(new SelectSub(() -> WrapperUtils.buildSubSqlByWrapper(clazz, wrapper, LambdaUtils.getName(alias)), hasAlias, this.alias));
+        String name = LambdaUtils.getName(alias);
+        this.selectColumns.add(new SelectSub(() -> WrapperUtils.buildSubSqlByWrapper(clazz, wrapper, name), hasAlias, this.alias, name));
         return typedThis;
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
index f49f7be..5aae207 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
@@ -3,6 +3,7 @@ package com.github.yulichang.wrapper.interfaces;
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.LambdaUtils;
@@ -15,7 +16,6 @@ import com.github.yulichang.wrapper.enums.DefaultFuncEnum;
 import com.github.yulichang.wrapper.segments.*;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -90,7 +90,7 @@ public interface Query<Children> extends Serializable {
      * @param columns 列
      */
     default Children select(String... columns) {
-        getSelectColum().addAll(Arrays.stream(columns).map(i -> new SelectString(i, isHasAlias(), getAlias())).collect(Collectors.toList()));
+        getSelectColum().add(new SelectString(String.join(StringPool.COMMA, columns), null));
         return getChildren();
     }
 
@@ -100,7 +100,7 @@ public interface Query<Children> extends Serializable {
      * @param column 列
      */
     default <E> Children selectAs(String column, SFunction<E, ?> alias) {
-        getSelectColum().add(new SelectString(column + Constants.AS + LambdaUtils.getName(alias), isHasAlias(), getAlias()));
+        getSelectColum().add(new SelectString(column + Constants.AS + LambdaUtils.getName(alias), LambdaUtils.getName(alias)));
         return getChildren();
     }
 
@@ -113,8 +113,7 @@ public interface Query<Children> extends Serializable {
         Map<String, SelectCache> cacheMap = ColumnCache.getMapField(LambdaUtils.getEntityClass(column));
         SelectCache cache = cacheMap.get(LambdaUtils.getName(column));
         getSelectColum().add(new SelectString(
-                index + Constants.DOT + cache.getColumn() + Constants.AS + LambdaUtils.getName(alias),
-                isHasAlias(), getAlias()));
+                index + Constants.DOT + cache.getColumn() + Constants.AS + LambdaUtils.getName(alias), LambdaUtils.getName(alias)));
         return getChildren();
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/SelectWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/SelectWrapper.java
index 69a66d9..5e8a29f 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/SelectWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/SelectWrapper.java
@@ -21,4 +21,8 @@ public interface SelectWrapper<Entity, Children> {
     boolean isResultMap();
 
     List<?> getResultMapMybatisLabel();
+
+    String getFrom();
+
+    String getAlias();
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectString.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectString.java
index 3f6546f..31b60dd 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectString.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectString.java
@@ -1,6 +1,7 @@
 package com.github.yulichang.wrapper.segments;
 
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.yulichang.wrapper.enums.BaseFuncEnum;
 import org.apache.ibatis.type.TypeHandler;
 
@@ -13,14 +14,11 @@ import org.apache.ibatis.type.TypeHandler;
 public class SelectString implements Select {
     private final String column;
 
-    private final boolean hasTableAlias;
+    private final String tagProperty;
 
-    private final String tableAlias;
-
-    public SelectString(String column, boolean hasTableAlias, String tableAlias) {
+    public SelectString(String column, String tagProperty) {
         this.column = column;
-        this.hasTableAlias = hasTableAlias;
-        this.tableAlias = tableAlias;
+        this.tagProperty = null == tagProperty ? null : StringUtils.getTargetColumn(tagProperty);
     }
 
     @Override
@@ -35,12 +33,12 @@ public class SelectString implements Select {
 
     @Override
     public boolean isHasTableAlias() {
-        return this.hasTableAlias;
+        throw new UnsupportedOperationException();
     }
 
     @Override
     public String getTableAlias() {
-        return this.tableAlias;
+        throw new UnsupportedOperationException();
     }
 
     @Override
@@ -60,12 +58,12 @@ public class SelectString implements Select {
 
     @Override
     public String getTagColumn() {
-        return null;
+        return tagProperty;
     }
 
     @Override
     public String getColumProperty() {
-        return null;
+        return tagProperty;
     }
 
     @Override
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectSub.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectSub.java
index 6b35a8d..68908a9 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectSub.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectSub.java
@@ -2,6 +2,7 @@ package com.github.yulichang.wrapper.segments;
 
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.yulichang.wrapper.enums.BaseFuncEnum;
 import org.apache.ibatis.type.TypeHandler;
 
@@ -22,10 +23,13 @@ public class SelectSub implements Select {
 
     private final String tableAlias;
 
-    public SelectSub(Supplier<String> column, boolean hasTableAlias, String tableAlias) {
+    private final String tagProperty;
+
+    public SelectSub(Supplier<String> column, boolean hasTableAlias, String tableAlias,String tagProperty) {
         this.column = column;
         this.hasTableAlias = hasTableAlias;
         this.tableAlias = tableAlias;
+        this.tagProperty = null == tagProperty ? null : StringUtils.getTargetColumn(tagProperty);
     }
 
     @Override
@@ -65,12 +69,12 @@ public class SelectSub implements Select {
 
     @Override
     public String getTagColumn() {
-        return null;
+        return tagProperty;
     }
 
     @Override
     public String getColumProperty() {
-        return null;
+        return tagProperty;
     }
 
     @Override
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index 4cc9630..f95bd05 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -64,15 +64,15 @@ class LambdaWrapperTest {
     @Test
     void testSelectSort() {
         ThreadLocalUtils.set("SELECT t.id, t.user_id, t.tenant_id FROM user_tenant t WHERE t.tenant_id = 1");
-        MPJLambdaWrapper<UserTenantDO> lambda = JoinWrappers.lambda(UserTenantDO.class);
-        lambda.selectAsClass(UserTenantDO.class, UserTenantDTO.class);
+        MPJLambdaWrapper<UserTenantDO> lambda = JoinWrappers.lambda(UserTenantDO.class)
+                .selectAsClass(UserTenantDO.class, UserTenantDTO.class);
         List<UserTenantDO> list = userTenantMapper.selectJoinList(UserTenantDO.class, lambda);
         assert list.size() == 5 && list.get(0).getIdea() != null;
 
 
         ThreadLocalUtils.set("SELECT t.tenant_id, t.user_id, t.id FROM user_tenant t WHERE t.tenant_id = 1");
-        MPJLambdaWrapper<UserTenantDO> lambda1 = JoinWrappers.lambda(UserTenantDO.class);
-        lambda1.selectAsClass(UserTenantDO.class, UserTenantDescDTO.class);
+        MPJLambdaWrapper<UserTenantDO> lambda1 = JoinWrappers.lambda(UserTenantDO.class)
+                .selectAsClass(UserTenantDO.class, UserTenantDescDTO.class);
         List<UserTenantDO> list1 = userTenantMapper.selectJoinList(UserTenantDO.class, lambda1);
         assert list1.size() == 5 && list1.get(0).getIdea() != null;
     }
@@ -526,7 +526,6 @@ class LambdaWrapperTest {
         assert l4.size() == 14 && l4.get(0).getAddressList().size() == 5;
     }
 
-
     /**
      * 别名测试
      */
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/StringColumTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/StringColumTest.java
new file mode 100644
index 0000000..aa00c34
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/StringColumTest.java
@@ -0,0 +1,48 @@
+package com.github.yulichang.test.join.m;
+
+import com.github.yulichang.test.join.dto.UserDTO;
+import com.github.yulichang.test.join.entity.AddressDO;
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.join.mapper.UserMapper;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@SpringBootTest
+public class StringColumTest {
+
+    @Resource
+    private UserMapper userMapper;
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+
+    @Test
+    @SneakyThrows
+    void stringColum() {
+        ThreadLocalUtils.set("SELECT (SELECT id FROM `user` u WHERE u.id = t.id) id, t.`name` AS PName, t.`name` PName, t.`name`," +
+                " (SELECT id FROM `user` u WHERE u.id = t.id), t1.id AS joina_id, t1.user_id, t1.area_id, t1.tel, " +
+                "t1.address, t1.del FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del = false AND t1.del = false LIMIT 1");
+        List<UserDTO> l3 = userMapper.selectJoinList(UserDTO.class, new MPJLambdaWrapper<UserDO>()
+                .select("(select id from `user` u where u.id = t.id) id")
+                .select("t.`name` as PName")
+                .select("t.`name` PName")
+                .select("t.`name`")
+                .select("(select id from `user` u where u.id = t.id) ")
+                .selectAssociation(AddressDO.class, UserDTO::getAddressDTO)
+                .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId)
+                .last("limit 1"));
+        assert l3.get(0).getPName() != null;
+        l3.forEach(System.out::println);
+    }
+}

From 5acf97e08aa9107ad573660d999fa71daebdc28b Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 17 Jan 2024 02:20:09 +0800
Subject: [PATCH 65/88] solon

---
 mybatis-plus-join-solon-plugin/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mybatis-plus-join-solon-plugin/README.md b/mybatis-plus-join-solon-plugin/README.md
index 1719943..9fcacd0 100644
--- a/mybatis-plus-join-solon-plugin/README.md
+++ b/mybatis-plus-join-solon-plugin/README.md
@@ -19,7 +19,7 @@ public interface UserMapper extends MPJBaseMapper<UserDO> {
 }
 ```
 
-### (可选)service继承JoinService
+### (可选)service继承MPJBaseService
 
 ```java
 import com.github.yulichang.mybatisplusjoin.solon.plugin.base.MPJBaseService;
@@ -29,7 +29,7 @@ public interface UserService extends MPJBaseService<UserDO> {
 }
 ```
 
-### (可选)serviceImpl继承JoinServiceImpl
+### (可选)serviceImpl继承MPJBaseServiceImpl
 
 ```java
 import com.github.yulichang.mybatisplusjoin.solon.plugin.base.MPJBaseServiceImpl;

From c7ea5485fdc3a282a8af5ec7d561beb666caf3ac Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 17 Jan 2024 14:12:26 +0800
Subject: [PATCH 66/88] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mybatis-plus-join-solon-plugin/pom.xml               |  2 +-
 .../mybatisplusjoin/solon/plugin/XPluginImpl.java    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mybatis-plus-join-solon-plugin/pom.xml b/mybatis-plus-join-solon-plugin/pom.xml
index b27d424..4fd0e8c 100644
--- a/mybatis-plus-join-solon-plugin/pom.xml
+++ b/mybatis-plus-join-solon-plugin/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>mybatis-plus-join-solon-plugin</artifactId>
 
     <properties>
-        <solon.varrsion>2.6.3</solon.varrsion>
+        <solon.varrsion>2.6.4</solon.varrsion>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
index 7db2be8..b7bcf07 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
@@ -3,13 +3,13 @@ package com.github.yulichang.mybatisplusjoin.solon.plugin;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.config.MPJInterceptorConfig;
-import com.github.yulichang.config.enums.IfPresentEnum;
+import com.github.yulichang.config.enums.IfExistsEnum;
 import com.github.yulichang.config.enums.LogicDelTypeEnum;
 import com.github.yulichang.extension.mapping.config.MappingConfig;
 import com.github.yulichang.injector.MPJSqlInjector;
 import com.github.yulichang.toolkit.SpringContentUtils;
 import com.github.yulichang.toolkit.reflect.GenericTypeUtils;
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.solon.MybatisAdapter;
 import org.apache.ibatis.solon.integration.MybatisAdapterManager;
@@ -59,10 +59,10 @@ public class XPluginImpl implements Plugin {
                 Arrays.stream(LogicDelTypeEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()
                         .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.logicDelType 配置错误")));
         ConfigProperties.mappingMaxCount = prop.get("mappingMaxCount", Integer::parseInt);
-        ConfigProperties.ifPresent = prop.get("ifPresent", val ->
-                Arrays.stream(IfPresentEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()
-                        .map(m -> (BiPredicate<Object, IfPresentSqlKeyWordEnum>) (o, enums) -> m.test(o))
-                        .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.ifPresent 配置错误")));
+        ConfigProperties.ifExists = prop.get("ifExists", val ->
+                Arrays.stream(IfExistsEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()
+                        .map(m -> (BiPredicate<Object, IfExistsSqlKeyWordEnum>) (o, enums) -> m.test(o))
+                        .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.ifExists 配置错误")));
         // 后续操作
         context.onEvent(AppLoadEndEvent.class, e -> {
             List<SqlSessionFactory> sqlSessionFactoryList = MybatisAdapterManager.getAll().values().stream()

From 39942b28cef9cb2268ff9de18125a3def2905021 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 17 Jan 2024 14:21:01 +0800
Subject: [PATCH 67/88] ifPresent -> ifExists

---
 .../MybatisPlusJoinAutoConfiguration.java     |  12 +-
 .../MybatisPlusJoinProperties.java            |   6 +-
 .../MybatisPlusJoinIfExistsConsumer.java      |  14 ++
 .../MybatisPlusJoinIfPresentConsumer.java     |  14 --
 ...itional-spring-configuration-metadata.json |   8 +-
 .../yulichang/config/ConfigProperties.java    |   8 +-
 .../{IfPresentEnum.java => IfExistsEnum.java} |   4 +-
 .../yulichang/kt/KtAbstractWrapper.java       |  24 +--
 .../kt/interfaces/CompareIfExists.java        | 115 +++++++++++++
 .../kt/interfaces/CompareIfPresent.java       | 115 -------------
 .../query/MPJLambdaQueryWrapper.java          |  26 +--
 .../yulichang/query/MPJQueryWrapper.java      |  26 +--
 .../query/interfaces/CompareIfExists.java     | 151 ++++++++++++++++++
 .../query/interfaces/CompareIfPresent.java    | 151 ------------------
 .../wrapper/JoinAbstractWrapper.java          |  26 +--
 .../yulichang/wrapper/MPJLambdaWrapper.java   |  12 +-
 ...dEnum.java => IfExistsSqlKeyWordEnum.java} |   2 +-
 .../wrapper/interfaces/CompareIfExists.java   | 114 +++++++++++++
 .../wrapper/interfaces/CompareIfPresent.java  | 114 -------------
 .../interfaces/CompareStrIfExists.java        |  65 ++++++++
 .../interfaces/CompareStrIfPresent.java       |  65 --------
 .../yulichang/wrapper/interfaces/Query.java   |   8 +-
 .../test/join/m/CustomWrapperTest.java        |   6 +-
 .../{IfPresentTest.java => IfExistsTest.java} |  72 ++++-----
 .../yulichang/test/kt/m/CustomWrapperTest.kt  |   6 +-
 25 files changed, 582 insertions(+), 582 deletions(-)
 create mode 100644 mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfExistsConsumer.java
 delete mode 100644 mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfPresentConsumer.java
 rename mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/{IfPresentEnum.java => IfExistsEnum.java} (89%)
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfExists.java
 delete mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfPresent.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfExists.java
 delete mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfPresent.java
 rename mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/{IfPresentSqlKeyWordEnum.java => IfExistsSqlKeyWordEnum.java} (87%)
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfExists.java
 delete mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfPresent.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfExists.java
 delete mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfPresent.java
 rename mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/{IfPresentTest.java => IfExistsTest.java} (53%)

diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
index 66bf5c0..37a17c1 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
@@ -3,7 +3,7 @@ package com.github.yulichang.autoconfigure;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusLanguageDriverAutoConfiguration;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
 import com.github.yulichang.autoconfigure.conditional.JoinSqlInjectorCondition;
-import com.github.yulichang.autoconfigure.consumer.MybatisPlusJoinIfPresentConsumer;
+import com.github.yulichang.autoconfigure.consumer.MybatisPlusJoinIfExistsConsumer;
 import com.github.yulichang.autoconfigure.consumer.MybatisPlusJoinPropertiesConsumer;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.config.MPJInterceptorConfig;
@@ -11,7 +11,7 @@ import com.github.yulichang.extension.mapping.config.MappingConfig;
 import com.github.yulichang.injector.MPJSqlInjector;
 import com.github.yulichang.interceptor.MPJInterceptor;
 import com.github.yulichang.toolkit.SpringContentUtils;
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.slf4j.Logger;
@@ -63,7 +63,7 @@ public class MybatisPlusJoinAutoConfiguration {
 
     public MybatisPlusJoinAutoConfiguration(MybatisPlusJoinProperties properties,
                                             ObjectProvider<MybatisPlusJoinPropertiesConsumer> propertiesConsumers,
-                                            ObjectProvider<MybatisPlusJoinIfPresentConsumer> ifPresentConsumers) {
+                                            ObjectProvider<MybatisPlusJoinIfExistsConsumer> IfExistsConsumers) {
         this.properties = Optional.ofNullable(propertiesConsumers.getIfAvailable()).map(c -> c.config(properties)).orElse(properties);
         ConfigProperties.banner = this.properties.getBanner();
         ConfigProperties.subTableLogic = this.properties.getSubTableLogic();
@@ -72,9 +72,9 @@ public class MybatisPlusJoinAutoConfiguration {
         ConfigProperties.joinPrefix = this.properties.getJoinPrefix();
         ConfigProperties.logicDelType = this.properties.getLogicDelType();
         ConfigProperties.mappingMaxCount = this.properties.getMappingMaxCount();
-        ConfigProperties.ifPresent = Optional.ofNullable(ifPresentConsumers.getIfAvailable())
-                .map(m -> (BiPredicate<Object, IfPresentSqlKeyWordEnum>) m)
-                .orElse((val, key) -> this.properties.getIfPresent().test(val));
+        ConfigProperties.ifExists = Optional.ofNullable(IfExistsConsumers.getIfAvailable())
+                .map(m -> (BiPredicate<Object, IfExistsSqlKeyWordEnum>) m)
+                .orElse((val, key) -> this.properties.getIfExists().test(val));
         info("mybatis plus join properties config complete");
     }
 
diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java
index 5948c63..4713894 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinProperties.java
@@ -1,6 +1,6 @@
 package com.github.yulichang.autoconfigure;
 
-import com.github.yulichang.config.enums.IfPresentEnum;
+import com.github.yulichang.config.enums.IfExistsEnum;
 import com.github.yulichang.config.enums.LogicDelTypeEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -58,7 +58,7 @@ public class MybatisPlusJoinProperties {
     private String subQueryAlias = "st";
 
     /**
-     * Wrapper ifPresent 判断策略
+     * Wrapper IfExists 判断策略
      * <p>
      * NOT_NULL 非null
      * <p>
@@ -66,5 +66,5 @@ public class MybatisPlusJoinProperties {
      * <p>
      * NOT_BLANK 非空白字符串  例： "" -> false, " " -> false, "\r" -> false, "abc" -> true ...
      */
-    private IfPresentEnum ifPresent = IfPresentEnum.NOT_EMPTY;
+    private IfExistsEnum IfExists = IfExistsEnum.NOT_EMPTY;
 }
diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfExistsConsumer.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfExistsConsumer.java
new file mode 100644
index 0000000..aa200d5
--- /dev/null
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfExistsConsumer.java
@@ -0,0 +1,14 @@
+package com.github.yulichang.autoconfigure.consumer;
+
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
+
+/**
+ * 自定义IfExists策略
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+public interface MybatisPlusJoinIfExistsConsumer extends BiPredicate<Object, IfExistsSqlKeyWordEnum> {
+}
diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfPresentConsumer.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfPresentConsumer.java
deleted file mode 100644
index d5c4fe2..0000000
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/consumer/MybatisPlusJoinIfPresentConsumer.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.yulichang.autoconfigure.consumer;
-
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
-
-import java.util.function.BiPredicate;
-
-/**
- * 自定义IfPresent策略
- *
- * @author yulichang
- * @since 1.4.9
- */
-public interface MybatisPlusJoinIfPresentConsumer extends BiPredicate<Object, IfPresentSqlKeyWordEnum> {
-}
diff --git a/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index b5e4f71..5dd7d84 100644
--- a/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/mybatis-plus-join-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -57,10 +57,10 @@
       "description": "子查询表别名."
     },
     {
-      "name": "mybatis-plus-join.if-present",
-      "defaultValue": "com.github.yulichang.config.enums.IfPresentEnum.NOT_EMPTY",
-      "type": "com.github.yulichang.config.enums.IfPresentEnum",
-      "description": "IfPresent方法判断策略,如需自定义请用@Bean形式MybatisPlusJoinIfPresentConsumer."
+      "name": "mybatis-plus-join.if-exist",
+      "defaultValue": "com.github.yulichang.config.enums.IfExistsEnum.NOT_EMPTY",
+      "type": "com.github.yulichang.config.enums.IfExistsEnum",
+      "description": "IfExists方法判断策略,如需自定义请用@Bean形式MybatisPlusJoinIfExistsConsumer."
     }
   ]
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
index d2e07ba..3aa43a6 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
@@ -2,9 +2,9 @@ package com.github.yulichang.config;
 
 import com.github.yulichang.adapter.AdapterHelper;
 import com.github.yulichang.adapter.base.ITableInfoAdapter;
-import com.github.yulichang.config.enums.IfPresentEnum;
+import com.github.yulichang.config.enums.IfExistsEnum;
 import com.github.yulichang.config.enums.LogicDelTypeEnum;
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
 
 import java.util.function.BiPredicate;
 
@@ -51,7 +51,7 @@ public class ConfigProperties {
      */
     public static String subQueryAlias = "st";
     /**
-     * Wrapper ifPresent 判断策略
+     * Wrapper IfExists 判断策略
      * <p>
      * NOT_NULL 非null
      * <p>
@@ -59,5 +59,5 @@ public class ConfigProperties {
      * <p>
      * NOT_BLANK 非空白字符串  例： "" -> false, " " -> false, "\r" -> false, "abc" -> true ...
      */
-    public static BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent = (val, key) -> IfPresentEnum.NOT_EMPTY.test(val);
+    public static BiPredicate<Object, IfExistsSqlKeyWordEnum> ifExists = (val, key) -> IfExistsEnum.NOT_EMPTY.test(val);
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfPresentEnum.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfExistsEnum.java
similarity index 89%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfPresentEnum.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfExistsEnum.java
index 913aa74..c5e3a97 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfPresentEnum.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfExistsEnum.java
@@ -11,7 +11,7 @@ import java.util.function.Predicate;
  * @author yulichang
  * @since 1.4.9
  */
-public enum IfPresentEnum implements Predicate<Object> {
+public enum IfExistsEnum implements Predicate<Object> {
 
     /**
      * 非null
@@ -28,7 +28,7 @@ public enum IfPresentEnum implements Predicate<Object> {
 
     private final Predicate<Object> predicate;
 
-    IfPresentEnum(Predicate<Object> predicate) {
+    IfExistsEnum(Predicate<Object> predicate) {
         this.predicate = predicate;
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
index ed11efd..b3b6c45 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.StringEscape;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.kt.interfaces.CompareIfPresent;
+import com.github.yulichang.kt.interfaces.CompareIfExists;
 import com.github.yulichang.kt.interfaces.Func;
 import com.github.yulichang.kt.interfaces.OnCompare;
 import com.github.yulichang.toolkit.KtUtils;
@@ -20,9 +20,9 @@ import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.Ref;
 import com.github.yulichang.toolkit.TableList;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
 import com.github.yulichang.wrapper.enums.PrefixEnum;
-import com.github.yulichang.wrapper.interfaces.CompareStrIfPresent;
+import com.github.yulichang.wrapper.interfaces.CompareStrIfExists;
 import com.github.yulichang.wrapper.interfaces.FuncStr;
 import com.github.yulichang.wrapper.interfaces.Join;
 import kotlin.reflect.KProperty;
@@ -47,8 +47,8 @@ import static java.util.stream.Collectors.joining;
  */
 @SuppressWarnings({"unused", "unchecked", "DuplicatedCode"})
 public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T, Children>> extends Wrapper<T>
-        implements CompareIfPresent<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
-        CompareStrIfPresent<Children, String>, FuncStr<Children, String> {
+        implements CompareIfExists<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
+        CompareStrIfExists<Children, String>, FuncStr<Children, String> {
 
     /**
      * 占位符
@@ -125,10 +125,10 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     protected boolean checkSqlInjection = false;
 
     /**
-     * ifPresent 策略
+     * IfExists 策略
      */
     @Getter
-    protected BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent = ConfigProperties.ifPresent;
+    protected BiPredicate<Object, IfExistsSqlKeyWordEnum> ifExists = ConfigProperties.ifExists;
 
     @Override
     public T getEntity() {
@@ -181,13 +181,13 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         return typedThis;
     }
 
-    public Children setIfPresent(BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
-        this.ifPresent = ifPresent;
+    public Children setIfExists(BiPredicate<Object, IfExistsSqlKeyWordEnum> IfExists) {
+        this.ifExists = IfExists;
         return typedThis;
     }
 
-    public Children setIfPresent(Predicate<Object> ifPresent) {
-        this.ifPresent = (o, k) -> ifPresent.test(o);
+    public Children setIfExists(Predicate<Object> IfExists) {
+        this.ifExists = (o, k) -> IfExists.test(o);
         return typedThis;
     }
 
@@ -659,7 +659,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
         index = null;
         isMain = true;
         isNo = false;
-        ifPresent = ConfigProperties.ifPresent;
+        ifExists = ConfigProperties.ifExists;
     }
 
     /**
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfExists.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfExists.java
new file mode 100644
index 0000000..9a72541
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfExists.java
@@ -0,0 +1,115 @@
+package com.github.yulichang.kt.interfaces;
+
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
+import kotlin.reflect.KProperty;
+
+import java.util.function.BiPredicate;
+
+/**
+ * IfExists
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public interface CompareIfExists<Children> extends Compare<Children> {
+
+    BiPredicate<Object, IfExistsSqlKeyWordEnum> getIfExists();
+
+    default Children eqIfExists(KProperty<?> column, Object val) {
+        return eq(getIfExists().test(val, IfExistsSqlKeyWordEnum.EQ), null, column, val);
+    }
+
+    default Children eqIfExists(String alias, KProperty<?> column, Object val) {
+        return eq(getIfExists().test(val, IfExistsSqlKeyWordEnum.EQ), alias, column, val);
+    }
+
+    default Children neIfExists(KProperty<?> column, Object val) {
+        return ne(getIfExists().test(val, IfExistsSqlKeyWordEnum.NE), null, column, val);
+    }
+
+    default Children neIfExists(String alias, KProperty<?> column, Object val) {
+        return ne(getIfExists().test(val, IfExistsSqlKeyWordEnum.NE), alias, column, val);
+    }
+
+    default Children gtIfExists(KProperty<?> column, Object val) {
+        return gt(getIfExists().test(val, IfExistsSqlKeyWordEnum.GT), null, column, val);
+    }
+
+    default Children gtIfExists(String alias, KProperty<?> column, Object val) {
+        return gt(getIfExists().test(val, IfExistsSqlKeyWordEnum.GT), alias, column, val);
+    }
+
+
+    default Children geIfExists(KProperty<?> column, Object val) {
+        return ge(getIfExists().test(val, IfExistsSqlKeyWordEnum.GE), null, column, val);
+    }
+
+    default Children geIfExists(String alias, KProperty<?> column, Object val) {
+        return ge(getIfExists().test(val, IfExistsSqlKeyWordEnum.GE), alias, column, val);
+    }
+
+    default Children ltIfExists(KProperty<?> column, Object val) {
+        return lt(getIfExists().test(val, IfExistsSqlKeyWordEnum.LT), null, column, val);
+    }
+
+    default Children ltIfExists(String alias, KProperty<?> column, Object val) {
+        return lt(getIfExists().test(val, IfExistsSqlKeyWordEnum.LT), alias, column, val);
+    }
+
+    default Children leIfExists(KProperty<?> column, Object val) {
+        return le(getIfExists().test(val, IfExistsSqlKeyWordEnum.LE), null, column, val);
+    }
+
+    default Children leIfExists(String alias, KProperty<?> column, Object val) {
+        return le(getIfExists().test(val, IfExistsSqlKeyWordEnum.LE), alias, column, val);
+    }
+
+    default Children likeIfExists(KProperty<?> column, Object val) {
+        return like(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE), null, column, val);
+    }
+
+    default Children likeIfExists(String alisa, KProperty<?> column, Object val) {
+        return like(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE), alisa, column, val);
+    }
+
+    default Children notLikeIfExists(KProperty<?> column, Object val) {
+        return notLike(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE), null, column, val);
+    }
+
+    default Children notLikeIfExists(String alias, KProperty<?> column, Object val) {
+        return notLike(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE), alias, column, val);
+    }
+
+    default Children likeLeftIfExists(KProperty<?> column, Object val) {
+        return likeLeft(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE_LEFT), null, column, val);
+    }
+
+    default Children likeLeftIfExists(String alias, KProperty<?> column, Object val) {
+        return likeLeft(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE_LEFT), alias, column, val);
+    }
+
+    default Children notLikeLeftIfExists(KProperty<?> column, Object val) {
+        return notLikeLeft(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE_LEFT), null, column, val);
+    }
+
+    default Children notLikeLeftIfExists(String alias, KProperty<?> column, Object val) {
+        return notLikeLeft(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE_LEFT), alias, column, val);
+    }
+
+    default Children likeRightIfExists(KProperty<?> column, Object val) {
+        return likeRight(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE_RIGHT), null, column, val);
+    }
+
+    default Children likeRightIfExists(String alias, KProperty<?> column, Object val) {
+        return likeRight(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE_RIGHT), alias, column, val);
+    }
+
+    default Children notLikeRightIfExists(KProperty<?> column, Object val) {
+        return notLikeRight(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE_RIGHT), null, column, val);
+    }
+
+    default Children notLikeRightIfExists(String alias, KProperty<?> column, Object val) {
+        return notLikeRight(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE_RIGHT), alias, column, val);
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfPresent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfPresent.java
deleted file mode 100644
index ab1a0a6..0000000
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/CompareIfPresent.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.github.yulichang.kt.interfaces;
-
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
-import kotlin.reflect.KProperty;
-
-import java.util.function.BiPredicate;
-
-/**
- * ifPresent
- *
- * @author yulichang
- * @since 1.4.9
- */
-@SuppressWarnings("unused")
-public interface CompareIfPresent<Children> extends Compare<Children> {
-
-    BiPredicate<Object, IfPresentSqlKeyWordEnum> getIfPresent();
-
-    default Children eqIfPresent(KProperty<?> column, Object val) {
-        return eq(getIfPresent().test(val, IfPresentSqlKeyWordEnum.EQ), null, column, val);
-    }
-
-    default Children eqIfPresent(String alias, KProperty<?> column, Object val) {
-        return eq(getIfPresent().test(val, IfPresentSqlKeyWordEnum.EQ), alias, column, val);
-    }
-
-    default Children neIfPresent(KProperty<?> column, Object val) {
-        return ne(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NE), null, column, val);
-    }
-
-    default Children neIfPresent(String alias, KProperty<?> column, Object val) {
-        return ne(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NE), alias, column, val);
-    }
-
-    default Children gtIfPresent(KProperty<?> column, Object val) {
-        return gt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GT), null, column, val);
-    }
-
-    default Children gtIfPresent(String alias, KProperty<?> column, Object val) {
-        return gt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GT), alias, column, val);
-    }
-
-
-    default Children geIfPresent(KProperty<?> column, Object val) {
-        return ge(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GE), null, column, val);
-    }
-
-    default Children geIfPresent(String alias, KProperty<?> column, Object val) {
-        return ge(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GE), alias, column, val);
-    }
-
-    default Children ltIfPresent(KProperty<?> column, Object val) {
-        return lt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LT), null, column, val);
-    }
-
-    default Children ltIfPresent(String alias, KProperty<?> column, Object val) {
-        return lt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LT), alias, column, val);
-    }
-
-    default Children leIfPresent(KProperty<?> column, Object val) {
-        return le(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LE), null, column, val);
-    }
-
-    default Children leIfPresent(String alias, KProperty<?> column, Object val) {
-        return le(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LE), alias, column, val);
-    }
-
-    default Children likeIfPresent(KProperty<?> column, Object val) {
-        return like(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE), null, column, val);
-    }
-
-    default Children likeIfPresent(String alisa, KProperty<?> column, Object val) {
-        return like(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE), alisa, column, val);
-    }
-
-    default Children notLikeIfPresent(KProperty<?> column, Object val) {
-        return notLike(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE), null, column, val);
-    }
-
-    default Children notLikeIfPresent(String alias, KProperty<?> column, Object val) {
-        return notLike(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE), alias, column, val);
-    }
-
-    default Children likeLeftIfPresent(KProperty<?> column, Object val) {
-        return likeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_LEFT), null, column, val);
-    }
-
-    default Children likeLeftIfPresent(String alias, KProperty<?> column, Object val) {
-        return likeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_LEFT), alias, column, val);
-    }
-
-    default Children notLikeLeftIfPresent(KProperty<?> column, Object val) {
-        return notLikeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_LEFT), null, column, val);
-    }
-
-    default Children notLikeLeftIfPresent(String alias, KProperty<?> column, Object val) {
-        return notLikeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_LEFT), alias, column, val);
-    }
-
-    default Children likeRightIfPresent(KProperty<?> column, Object val) {
-        return likeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_RIGHT), null, column, val);
-    }
-
-    default Children likeRightIfPresent(String alias, KProperty<?> column, Object val) {
-        return likeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_RIGHT), alias, column, val);
-    }
-
-    default Children notLikeRightIfPresent(KProperty<?> column, Object val) {
-        return notLikeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_RIGHT), null, column, val);
-    }
-
-    default Children notLikeRightIfPresent(String alias, KProperty<?> column, Object val) {
-        return notLikeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_RIGHT), alias, column, val);
-    }
-}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
index 97f880d..d03e725 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
@@ -9,12 +9,12 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.query.interfaces.CompareIfPresent;
+import com.github.yulichang.query.interfaces.CompareIfExists;
 import com.github.yulichang.query.interfaces.StringJoin;
 import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.ThrowOptional;
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
 import lombok.Getter;
 
 import java.io.UnsupportedEncodingException;
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 @SuppressWarnings("unused")
 public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambdaQueryWrapper<T>>
         implements Query<MPJLambdaQueryWrapper<T>, T, SFunction<T, ?>>, StringJoin<MPJLambdaQueryWrapper<T>, T>,
-        CompareIfPresent<MPJLambdaQueryWrapper<T>, SFunction<T, ?>> {
+        CompareIfExists<MPJLambdaQueryWrapper<T>, SFunction<T, ?>> {
 
     /**
      * 查询字段
@@ -78,7 +78,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
     private Function<String, String> tableNameFunc;
 
     @Getter
-    private BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent = ConfigProperties.ifPresent;
+    private BiPredicate<Object, IfExistsSqlKeyWordEnum> ifExists = ConfigProperties.ifExists;
 
     /**
      * 不建议直接 new 该实例，使用 Wrappers.lambdaQuery(entity)
@@ -94,7 +94,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
                           Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments,
                           SharedString lastSql, SharedString sqlComment, SharedString sqlFirst,
                           List<String> selectColumns, List<String> ignoreColumns, boolean selectDistinct,
-                          BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
+                          BiPredicate<Object, IfExistsSqlKeyWordEnum> IfExists) {
         super.setEntity(entity);
         setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -108,7 +108,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
         this.selectColumns = selectColumns;
         this.ignoreColumns = ignoreColumns;
         this.selectDistinct = selectDistinct;
-        this.ifPresent = ifPresent;
+        this.ifExists = IfExists;
     }
 
     /**
@@ -235,7 +235,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
     public MPJQueryWrapper<T> stringQuery() {
         return new MPJQueryWrapper<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs,
                 expression, sqlSelect, from, lastSql, sqlComment, sqlFirst, selectColumns, ignoreColumns,
-                selectDistinct, ifPresent);
+                selectDistinct, ifExists);
     }
 
     @Override
@@ -337,13 +337,13 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
         return this.tableNameFunc.apply(decode);
     }
 
-    public MPJLambdaQueryWrapper<T> setIfPresent(BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
-        this.ifPresent = ifPresent;
+    public MPJLambdaQueryWrapper<T> setIfExists(BiPredicate<Object, IfExistsSqlKeyWordEnum> IfExists) {
+        this.ifExists = IfExists;
         return typedThis;
     }
 
-    public MPJLambdaQueryWrapper<T> setIfPresent(Predicate<Object> ifPresent) {
-        this.ifPresent = (o, k) -> ifPresent.test(o);
+    public MPJLambdaQueryWrapper<T> setIfExists(Predicate<Object> IfExists) {
+        this.ifExists = (o, k) -> IfExists.test(o);
         return typedThis;
     }
 
@@ -355,7 +355,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
     protected MPJLambdaQueryWrapper<T> instance() {
         return new MPJLambdaQueryWrapper<>(getEntity(), getEntityClass(), null, null, paramNameSeq, paramNameValuePairs,
                 new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
-                null, null, selectDistinct, ifPresent);
+                null, null, selectDistinct, ifExists);
     }
 
     @Override
@@ -391,7 +391,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
         from.toNull();
         selectColumns.clear();
         ignoreColumns.clear();
-        ifPresent = ConfigProperties.ifPresent;
+        ifExists = ConfigProperties.ifExists;
     }
 
     @Override
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
index a19a16f..68c8df1 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
@@ -11,13 +11,13 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.query.interfaces.CompareIfPresent;
+import com.github.yulichang.query.interfaces.CompareIfExists;
 import com.github.yulichang.query.interfaces.StringJoin;
 import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.ThrowOptional;
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
 import com.github.yulichang.wrapper.interfaces.Chain;
 import lombok.Getter;
 
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
 @SuppressWarnings("unused")
 public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapper<T>> implements
         Query<MPJQueryWrapper<T>, T, String>, StringJoin<MPJQueryWrapper<T>, T>, Chain<T>,
-        CompareIfPresent<MPJQueryWrapper<T>, String> {
+        CompareIfExists<MPJQueryWrapper<T>, String> {
 
     /**
      * 查询字段
@@ -91,7 +91,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
     private boolean checkSqlInjection = false;
 
     @Getter
-    private BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent = ConfigProperties.ifPresent;
+    private BiPredicate<Object, IfExistsSqlKeyWordEnum> ifExists = ConfigProperties.ifExists;
 
 
     public MPJQueryWrapper() {
@@ -124,7 +124,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
                            SharedString sqlSelect, SharedString from, SharedString lastSql,
                            SharedString sqlComment, SharedString sqlFirst,
                            List<String> selectColumns, List<String> ignoreColumns, boolean selectDistinct,
-                           BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
+                           BiPredicate<Object, IfExistsSqlKeyWordEnum> IfExists) {
         super.setEntity(entity);
         setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -138,7 +138,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
         this.selectColumns = selectColumns;
         this.ignoreColumns = ignoreColumns;
         this.selectDistinct = selectDistinct;
-        this.ifPresent = ifPresent;
+        this.ifExists = IfExists;
     }
 
     /**
@@ -149,13 +149,13 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
         return this;
     }
 
-    public MPJQueryWrapper<T> setIfPresent(BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
-        this.ifPresent = ifPresent;
+    public MPJQueryWrapper<T> setIfExists(BiPredicate<Object, IfExistsSqlKeyWordEnum> IfExists) {
+        this.ifExists = IfExists;
         return this;
     }
 
-    public MPJQueryWrapper<T> setIfPresent(Predicate<Object> ifPresent) {
-        this.ifPresent = (o, k) -> ifPresent.test(o);
+    public MPJQueryWrapper<T> setIfExists(Predicate<Object> IfExists) {
+        this.ifExists = (o, k) -> IfExists.test(o);
         return this;
     }
 
@@ -354,7 +354,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
      */
     public MPJLambdaQueryWrapper<T> lambda() {
         return new MPJLambdaQueryWrapper<>(getEntity(), getEntityClass(), from, sqlSelect, paramNameSeq, paramNameValuePairs,
-                expression, lastSql, sqlComment, getSqlFirstField(), selectColumns, ignoreColumns, selectDistinct, ifPresent);
+                expression, lastSql, sqlComment, getSqlFirstField(), selectColumns, ignoreColumns, selectDistinct, ifExists);
     }
 
     @Override
@@ -391,7 +391,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
     protected MPJQueryWrapper<T> instance() {
         return new MPJQueryWrapper<>(getEntity(), getEntityClass(), paramNameSeq, paramNameValuePairs, new MergeSegments(),
                 null, null, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
-                null, null, selectDistinct, ifPresent);
+                null, null, selectDistinct, ifExists);
     }
 
 
@@ -402,7 +402,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
         from.toNull();
         selectColumns.clear();
         ignoreColumns.clear();
-        ifPresent = ConfigProperties.ifPresent;
+        ifExists = ConfigProperties.ifExists;
     }
 
     @Override
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfExists.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfExists.java
new file mode 100644
index 0000000..67548fd
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfExists.java
@@ -0,0 +1,151 @@
+package com.github.yulichang.query.interfaces;
+
+import com.baomidou.mybatisplus.core.conditions.interfaces.Compare;
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
+
+/**
+ * 查询条件封装
+ * <p>比较值</p>
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public interface CompareIfExists<Children, R> extends Compare<Children, R> {
+
+    BiPredicate<Object, IfExistsSqlKeyWordEnum> getIfExists();
+
+    /**
+     * 等于 =
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children eqIfExists(R column, Object val) {
+        return eq(getIfExists().test(val, IfExistsSqlKeyWordEnum.EQ), column, val);
+    }
+
+    /**
+     * 不等于 &lt;&gt;
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children neIfExists(R column, Object val) {
+        return ne(getIfExists().test(val, IfExistsSqlKeyWordEnum.NE), column, val);
+    }
+
+    /**
+     * 大于 &gt;
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children gtIfExists(R column, Object val) {
+        return gt(getIfExists().test(val, IfExistsSqlKeyWordEnum.GT), column, val);
+    }
+
+    /**
+     * 大于等于 &gt;=
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children geIfExists(R column, Object val) {
+        return ge(getIfExists().test(val, IfExistsSqlKeyWordEnum.GE), column, val);
+    }
+
+    /**
+     * 小于 &lt;
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children ltIfExists(R column, Object val) {
+        return lt(getIfExists().test(val, IfExistsSqlKeyWordEnum.LT), column, val);
+    }
+
+    /**
+     * 小于等于 &lt;=
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children leIfExists(R column, Object val) {
+        return le(getIfExists().test(val, IfExistsSqlKeyWordEnum.LE), column, val);
+    }
+
+    /**
+     * LIKE '%值%'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children likeIfExists(R column, Object val) {
+        return like(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE), column, val);
+    }
+
+    /**
+     * NOT LIKE '%值%'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children notLikeIfExists(R column, Object val) {
+        return notLike(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE), column, val);
+    }
+
+    /**
+     * NOT LIKE '%值'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children notLikeLeftIfExists(R column, Object val) {
+        return notLikeLeft(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE_LEFT), column, val);
+    }
+
+    /**
+     * NOT LIKE '值%'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children notLikeRightIfExists(R column, Object val) {
+        return notLikeRight(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE_RIGHT), column, val);
+    }
+
+    /**
+     * LIKE '%值'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children likeLeftIfExists(R column, Object val) {
+        return likeLeft(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE_LEFT), column, val);
+    }
+
+    /**
+     * LIKE '值%'
+     *
+     * @param column 字段
+     * @param val    值
+     * @return children
+     */
+    default Children likeRightIfExists(R column, Object val) {
+        return likeRight(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE_RIGHT), column, val);
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfPresent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfPresent.java
deleted file mode 100644
index 06b9066..0000000
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/interfaces/CompareIfPresent.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.github.yulichang.query.interfaces;
-
-import com.baomidou.mybatisplus.core.conditions.interfaces.Compare;
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
-
-import java.util.function.BiPredicate;
-
-/**
- * 查询条件封装
- * <p>比较值</p>
- *
- * @author yulichang
- * @since 1.4.9
- */
-@SuppressWarnings("unused")
-public interface CompareIfPresent<Children, R> extends Compare<Children, R> {
-
-    BiPredicate<Object, IfPresentSqlKeyWordEnum> getIfPresent();
-
-    /**
-     * 等于 =
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children eqIfPresent(R column, Object val) {
-        return eq(getIfPresent().test(val, IfPresentSqlKeyWordEnum.EQ), column, val);
-    }
-
-    /**
-     * 不等于 &lt;&gt;
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children neIfPresent(R column, Object val) {
-        return ne(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NE), column, val);
-    }
-
-    /**
-     * 大于 &gt;
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children gtIfPresent(R column, Object val) {
-        return gt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GT), column, val);
-    }
-
-    /**
-     * 大于等于 &gt;=
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children geIfPresent(R column, Object val) {
-        return ge(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GE), column, val);
-    }
-
-    /**
-     * 小于 &lt;
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children ltIfPresent(R column, Object val) {
-        return lt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LT), column, val);
-    }
-
-    /**
-     * 小于等于 &lt;=
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children leIfPresent(R column, Object val) {
-        return le(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LE), column, val);
-    }
-
-    /**
-     * LIKE '%值%'
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children likeIfPresent(R column, Object val) {
-        return like(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE), column, val);
-    }
-
-    /**
-     * NOT LIKE '%值%'
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children notLikeIfPresent(R column, Object val) {
-        return notLike(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE), column, val);
-    }
-
-    /**
-     * NOT LIKE '%值'
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children notLikeLeftIfPresent(R column, Object val) {
-        return notLikeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_LEFT), column, val);
-    }
-
-    /**
-     * NOT LIKE '值%'
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children notLikeRightIfPresent(R column, Object val) {
-        return notLikeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_RIGHT), column, val);
-    }
-
-    /**
-     * LIKE '%值'
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children likeLeftIfPresent(R column, Object val) {
-        return likeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_LEFT), column, val);
-    }
-
-    /**
-     * LIKE '值%'
-     *
-     * @param column 字段
-     * @param val    值
-     * @return children
-     */
-    default Children likeRightIfPresent(R column, Object val) {
-        return likeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_RIGHT), column, val);
-    }
-}
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 785c690..e0f34de 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
@@ -18,7 +18,7 @@ import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.Ref;
 import com.github.yulichang.toolkit.TableList;
 import com.github.yulichang.toolkit.sql.SqlScriptUtils;
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
 import com.github.yulichang.wrapper.enums.PrefixEnum;
 import com.github.yulichang.wrapper.interfaces.*;
 import lombok.Getter;
@@ -42,8 +42,8 @@ import static java.util.stream.Collectors.joining;
  */
 @SuppressWarnings({"unchecked", "unused", "DuplicatedCode"})
 public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrapper<T, Children>> extends Wrapper<T>
-        implements CompareIfPresent<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
-        CompareStrIfPresent<Children, String>, FuncStr<Children, String> {
+        implements CompareIfExists<Children>, Nested<Children, Children>, Join<Children>, Func<Children>, OnCompare<Children>,
+        CompareStrIfExists<Children, String>, FuncStr<Children, String> {
 
     /**
      * 占位符
@@ -120,10 +120,10 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
     protected boolean checkSqlInjection = false;
 
     /**
-     * ifPresent 策略
+     * IfExists 策略
      */
     @Getter
-    protected BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent = ConfigProperties.ifPresent;
+    protected BiPredicate<Object, IfExistsSqlKeyWordEnum> ifExists = ConfigProperties.ifExists;
 
     @Override
     public T getEntity() {
@@ -176,20 +176,20 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
         return typedThis;
     }
 
-    public Children setIfPresent(BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
-        this.ifPresent = ifPresent;
+    public Children setIfExists(BiPredicate<Object, IfExistsSqlKeyWordEnum> IfExists) {
+        this.ifExists = IfExists;
         return typedThis;
     }
 
     /**
-     * 设置 ifPresent
-     * .ifPresent(val -> val != null && StringUtils.isNotBlank(val))
+     * 设置 IfExists
+     * .IfExists(val -> val != null && StringUtils.isNotBlank(val))
      *
-     * @param ifPresent 判断
+     * @param IfExists 判断
      * @return Children
      */
-    public Children setIfPresent(Predicate<Object> ifPresent) {
-        this.ifPresent = (obj, key) -> ifPresent.test(obj);
+    public Children setIfExists(Predicate<Object> IfExists) {
+        this.ifExists = (obj, key) -> IfExists.test(obj);
         return typedThis;
     }
 
@@ -773,7 +773,7 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
         index = null;
         isMain = true;
         isOn = false;
-        ifPresent = ConfigProperties.ifPresent;
+        ifExists = ConfigProperties.ifExists;
     }
 
     /**
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index 137e5c5..17367ec 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -9,7 +9,7 @@ import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.*;
 import com.github.yulichang.toolkit.support.ColumnCache;
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
 import com.github.yulichang.wrapper.interfaces.Chain;
 import com.github.yulichang.wrapper.interfaces.Query;
 import com.github.yulichang.wrapper.interfaces.QueryLabel;
@@ -126,7 +126,7 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
                      Map<String, Object> paramNameValuePairs, MergeSegments mergeSegments, SharedString paramAlias,
                      SharedString lastSql, SharedString sqlComment, SharedString sqlFirst,
                      TableList tableList, Integer index, String keyWord, Class<?> joinClass, String tableName,
-                     BiPredicate<Object, IfPresentSqlKeyWordEnum> ifPresent) {
+                     BiPredicate<Object, IfExistsSqlKeyWordEnum> IfExists) {
         super.setEntity(entity);
         super.setEntityClass(entityClass);
         this.paramNameSeq = paramNameSeq;
@@ -142,7 +142,7 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
         this.keyWord = keyWord;
         this.joinClass = joinClass;
         this.tableName = tableName;
-        this.ifPresent = ifPresent;
+        this.ifExists = IfExists;
     }
 
 
@@ -211,7 +211,7 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
         MPJLambdaWrapper<E> wrapper = new MPJLambdaWrapper<E>(null, clazz, SharedString.emptyString(),
                 paramNameSeq, paramNameValuePairs, new MergeSegments(), new SharedString(this.paramAlias
                 .getStringValue()), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
-                new TableList(), null, null, null, null, ifPresent) {
+                new TableList(), null, null, null, null, ifExists) {
         };
         wrapper.tableList.setAlias(st);
         wrapper.tableList.setRootClass(clazz);
@@ -409,7 +409,7 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
     protected MPJLambdaWrapper<T> instance(Integer index, String keyWord, Class<?> joinClass, String tableName) {
         return new MPJLambdaWrapper<>(getEntity(), getEntityClass(), null, paramNameSeq, paramNameValuePairs,
                 new MergeSegments(), this.paramAlias, SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
-                this.tableList, index, keyWord, joinClass, tableName, ifPresent);
+                this.tableList, index, keyWord, joinClass, tableName, ifExists);
     }
 
     @Override
@@ -422,6 +422,6 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
         if (Objects.nonNull(wrapperMap)) wrapperMap.clear();
         if (Objects.nonNull(unionSql)) unionSql.toEmpty();
         resultMapMybatisLabel.clear();
-        ifPresent = ConfigProperties.ifPresent;
+        ifExists = ConfigProperties.ifExists;
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfPresentSqlKeyWordEnum.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfExistsSqlKeyWordEnum.java
similarity index 87%
rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfPresentSqlKeyWordEnum.java
rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfExistsSqlKeyWordEnum.java
index 0ce627c..cdfb728 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfPresentSqlKeyWordEnum.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/enums/IfExistsSqlKeyWordEnum.java
@@ -6,7 +6,7 @@ package com.github.yulichang.wrapper.enums;
  * @author yulichang
  * @since 1.4.9
  */
-public enum IfPresentSqlKeyWordEnum {
+public enum IfExistsSqlKeyWordEnum {
     EQ,
     NE,
     GT,
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfExists.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfExists.java
new file mode 100644
index 0000000..bf9f786
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfExists.java
@@ -0,0 +1,114 @@
+package com.github.yulichang.wrapper.interfaces;
+
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
+
+/**
+ * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public interface CompareIfExists<Children> extends Compare<Children> {
+
+    BiPredicate<Object, IfExistsSqlKeyWordEnum> getIfExists();
+
+    default <R> Children eqIfExists(SFunction<R, ?> column, Object val) {
+        return eq(getIfExists().test(val, IfExistsSqlKeyWordEnum.EQ), null, column, val);
+    }
+
+    default <R> Children eqIfExists(String alias, SFunction<R, ?> column, Object val) {
+        return eq(getIfExists().test(val, IfExistsSqlKeyWordEnum.EQ), alias, column, val);
+    }
+
+    default <R> Children neIfExists(SFunction<R, ?> column, Object val) {
+        return ne(getIfExists().test(val, IfExistsSqlKeyWordEnum.NE), null, column, val);
+    }
+
+    default <R> Children neIfExists(String alias, SFunction<R, ?> column, Object val) {
+        return ne(getIfExists().test(val, IfExistsSqlKeyWordEnum.NE), alias, column, val);
+    }
+
+    default <R> Children gtIfExists(SFunction<R, ?> column, Object val) {
+        return gt(getIfExists().test(val, IfExistsSqlKeyWordEnum.GT), null, column, val);
+    }
+
+    default <R> Children gtIfExists(String alias, SFunction<R, ?> column, Object val) {
+        return gt(getIfExists().test(val, IfExistsSqlKeyWordEnum.GT), alias, column, val);
+    }
+
+    default <R> Children geIfExists(SFunction<R, ?> column, Object val) {
+        return ge(getIfExists().test(val, IfExistsSqlKeyWordEnum.GE), null, column, val);
+    }
+
+    default <R> Children geIfExists(String alias, SFunction<R, ?> column, Object val) {
+        return ge(getIfExists().test(val, IfExistsSqlKeyWordEnum.GE), alias, column, val);
+    }
+
+    default <R> Children ltIfExists(SFunction<R, ?> column, Object val) {
+        return lt(getIfExists().test(val, IfExistsSqlKeyWordEnum.LT), null, column, val);
+    }
+
+    default <R> Children ltIfExists(String alias, SFunction<R, ?> column, Object val) {
+        return lt(getIfExists().test(val, IfExistsSqlKeyWordEnum.LT), alias, column, val);
+    }
+
+    default <R> Children leIfExists(SFunction<R, ?> column, Object val) {
+        return le(getIfExists().test(val, IfExistsSqlKeyWordEnum.LE), null, column, val);
+    }
+
+    default <R> Children leIfExists(String alias, SFunction<R, ?> column, Object val) {
+        return le(getIfExists().test(val, IfExistsSqlKeyWordEnum.LE), alias, column, val);
+    }
+
+    default <R> Children likeIfExists(SFunction<R, ?> column, Object val) {
+        return like(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE), null, column, val);
+    }
+
+    default <R> Children likeIfExists(String alias, SFunction<R, ?> column, Object val) {
+        return like(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE), alias, column, val);
+    }
+
+    default <R> Children notLikeIfExists(SFunction<R, ?> column, Object val) {
+        return notLike(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE), null, column, val);
+    }
+
+    default <R> Children notLikeIfExists(String alias, SFunction<R, ?> column, Object val) {
+        return notLike(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE), alias, column, val);
+    }
+
+    default <R> Children likeLeftIfExists(SFunction<R, ?> column, Object val) {
+        return likeLeft(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE_LEFT), null, column, val);
+    }
+
+    default <R> Children likeLeftIfExists(String alias, SFunction<R, ?> column, Object val) {
+        return likeLeft(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE_LEFT), alias, column, val);
+    }
+
+    default <R> Children notLikeLeftIfExists(SFunction<R, ?> column, Object val) {
+        return notLikeLeft(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE_LEFT), null, column, val);
+    }
+
+    default <R> Children notLikeLeftIfExists(String alias, SFunction<R, ?> column, Object val) {
+        return notLikeLeft(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE_LEFT), alias, column, val);
+    }
+
+    default <R> Children likeRightIfExists(SFunction<R, ?> column, Object val) {
+        return likeRight(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE_RIGHT), null, column, val);
+    }
+
+    default <R> Children likeRightIfExists(String alias, SFunction<R, ?> column, Object val) {
+        return likeRight(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE_RIGHT), alias, column, val);
+    }
+
+    default <R> Children notLikeRightIfExists(SFunction<R, ?> column, Object val) {
+        return notLikeRight(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE_RIGHT), null, column, val);
+    }
+
+    default <R> Children notLikeRightIfExists(String alias, SFunction<R, ?> column, Object val) {
+        return notLikeRight(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE_RIGHT), alias, column, val);
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfPresent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfPresent.java
deleted file mode 100644
index 28c493f..0000000
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareIfPresent.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.github.yulichang.wrapper.interfaces;
-
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
-
-import java.util.function.BiPredicate;
-
-/**
- * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
- *
- * @author yulichang
- * @since 1.4.9
- */
-@SuppressWarnings("unused")
-public interface CompareIfPresent<Children> extends Compare<Children> {
-
-    BiPredicate<Object, IfPresentSqlKeyWordEnum> getIfPresent();
-
-    default <R> Children eqIfPresent(SFunction<R, ?> column, Object val) {
-        return eq(getIfPresent().test(val, IfPresentSqlKeyWordEnum.EQ), null, column, val);
-    }
-
-    default <R> Children eqIfPresent(String alias, SFunction<R, ?> column, Object val) {
-        return eq(getIfPresent().test(val, IfPresentSqlKeyWordEnum.EQ), alias, column, val);
-    }
-
-    default <R> Children neIfPresent(SFunction<R, ?> column, Object val) {
-        return ne(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NE), null, column, val);
-    }
-
-    default <R> Children neIfPresent(String alias, SFunction<R, ?> column, Object val) {
-        return ne(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NE), alias, column, val);
-    }
-
-    default <R> Children gtIfPresent(SFunction<R, ?> column, Object val) {
-        return gt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GT), null, column, val);
-    }
-
-    default <R> Children gtIfPresent(String alias, SFunction<R, ?> column, Object val) {
-        return gt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GT), alias, column, val);
-    }
-
-    default <R> Children geIfPresent(SFunction<R, ?> column, Object val) {
-        return ge(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GE), null, column, val);
-    }
-
-    default <R> Children geIfPresent(String alias, SFunction<R, ?> column, Object val) {
-        return ge(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GE), alias, column, val);
-    }
-
-    default <R> Children ltIfPresent(SFunction<R, ?> column, Object val) {
-        return lt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LT), null, column, val);
-    }
-
-    default <R> Children ltIfPresent(String alias, SFunction<R, ?> column, Object val) {
-        return lt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LT), alias, column, val);
-    }
-
-    default <R> Children leIfPresent(SFunction<R, ?> column, Object val) {
-        return le(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LE), null, column, val);
-    }
-
-    default <R> Children leIfPresent(String alias, SFunction<R, ?> column, Object val) {
-        return le(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LE), alias, column, val);
-    }
-
-    default <R> Children likeIfPresent(SFunction<R, ?> column, Object val) {
-        return like(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE), null, column, val);
-    }
-
-    default <R> Children likeIfPresent(String alias, SFunction<R, ?> column, Object val) {
-        return like(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE), alias, column, val);
-    }
-
-    default <R> Children notLikeIfPresent(SFunction<R, ?> column, Object val) {
-        return notLike(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE), null, column, val);
-    }
-
-    default <R> Children notLikeIfPresent(String alias, SFunction<R, ?> column, Object val) {
-        return notLike(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE), alias, column, val);
-    }
-
-    default <R> Children likeLeftIfPresent(SFunction<R, ?> column, Object val) {
-        return likeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_LEFT), null, column, val);
-    }
-
-    default <R> Children likeLeftIfPresent(String alias, SFunction<R, ?> column, Object val) {
-        return likeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_LEFT), alias, column, val);
-    }
-
-    default <R> Children notLikeLeftIfPresent(SFunction<R, ?> column, Object val) {
-        return notLikeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_LEFT), null, column, val);
-    }
-
-    default <R> Children notLikeLeftIfPresent(String alias, SFunction<R, ?> column, Object val) {
-        return notLikeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_LEFT), alias, column, val);
-    }
-
-    default <R> Children likeRightIfPresent(SFunction<R, ?> column, Object val) {
-        return likeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_RIGHT), null, column, val);
-    }
-
-    default <R> Children likeRightIfPresent(String alias, SFunction<R, ?> column, Object val) {
-        return likeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_RIGHT), alias, column, val);
-    }
-
-    default <R> Children notLikeRightIfPresent(SFunction<R, ?> column, Object val) {
-        return notLikeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_RIGHT), null, column, val);
-    }
-
-    default <R> Children notLikeRightIfPresent(String alias, SFunction<R, ?> column, Object val) {
-        return notLikeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_RIGHT), alias, column, val);
-    }
-}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfExists.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfExists.java
new file mode 100644
index 0000000..3a2b0b0
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfExists.java
@@ -0,0 +1,65 @@
+package com.github.yulichang.wrapper.interfaces;
+
+import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
+
+import java.util.function.BiPredicate;
+
+/**
+ * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
+ *
+ * @author yulichang
+ * @since 1.4.9
+ */
+@SuppressWarnings("unused")
+public interface CompareStrIfExists<Children, R> extends CompareStr<Children, R> {
+
+    BiPredicate<Object, IfExistsSqlKeyWordEnum> getIfExists();
+
+    default Children eqIfExists(R column, Object val) {
+        return eq(getIfExists().test(val, IfExistsSqlKeyWordEnum.EQ), column, val);
+    }
+
+    default Children neIfExists(R column, Object val) {
+        return ne(getIfExists().test(val, IfExistsSqlKeyWordEnum.NE), column, val);
+    }
+
+    default Children gtIfExists(R column, Object val) {
+        return gt(getIfExists().test(val, IfExistsSqlKeyWordEnum.GT), column, val);
+    }
+
+    default Children geIfExists(R column, Object val) {
+        return ge(getIfExists().test(val, IfExistsSqlKeyWordEnum.GE), column, val);
+    }
+
+    default Children ltIfExists(R column, Object val) {
+        return lt(getIfExists().test(val, IfExistsSqlKeyWordEnum.LT), column, val);
+    }
+
+    default Children leIfExists(R column, Object val) {
+        return le(getIfExists().test(val, IfExistsSqlKeyWordEnum.LE), column, val);
+    }
+
+    default Children likeIfExists(R column, Object val) {
+        return like(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE), column, val);
+    }
+
+    default Children notLikeIfExists(R column, Object val) {
+        return notLike(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE), column, val);
+    }
+
+    default Children likeLeftIfExists(R column, Object val) {
+        return likeLeft(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE_LEFT), column, val);
+    }
+
+    default Children likeRightIfExists(R column, Object val) {
+        return likeRight(getIfExists().test(val, IfExistsSqlKeyWordEnum.LIKE_RIGHT), column, val);
+    }
+
+    default Children notLikeLeftIfExists(R column, Object val) {
+        return notLikeLeft(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE_LEFT), column, val);
+    }
+
+    default Children notLikeRightIfExists(R column, Object val) {
+        return notLikeRight(getIfExists().test(val, IfExistsSqlKeyWordEnum.NOT_LIKE_RIGHT), column, val);
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfPresent.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfPresent.java
deleted file mode 100644
index 04b77fd..0000000
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/CompareStrIfPresent.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.github.yulichang.wrapper.interfaces;
-
-import com.github.yulichang.wrapper.enums.IfPresentSqlKeyWordEnum;
-
-import java.util.function.BiPredicate;
-
-/**
- * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
- *
- * @author yulichang
- * @since 1.4.9
- */
-@SuppressWarnings("unused")
-public interface CompareStrIfPresent<Children, R> extends CompareStr<Children, R> {
-
-    BiPredicate<Object, IfPresentSqlKeyWordEnum> getIfPresent();
-
-    default Children eqIfPresent(R column, Object val) {
-        return eq(getIfPresent().test(val, IfPresentSqlKeyWordEnum.EQ), column, val);
-    }
-
-    default Children neIfPresent(R column, Object val) {
-        return ne(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NE), column, val);
-    }
-
-    default Children gtIfPresent(R column, Object val) {
-        return gt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GT), column, val);
-    }
-
-    default Children geIfPresent(R column, Object val) {
-        return ge(getIfPresent().test(val, IfPresentSqlKeyWordEnum.GE), column, val);
-    }
-
-    default Children ltIfPresent(R column, Object val) {
-        return lt(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LT), column, val);
-    }
-
-    default Children leIfPresent(R column, Object val) {
-        return le(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LE), column, val);
-    }
-
-    default Children likeIfPresent(R column, Object val) {
-        return like(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE), column, val);
-    }
-
-    default Children notLikeIfPresent(R column, Object val) {
-        return notLike(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE), column, val);
-    }
-
-    default Children likeLeftIfPresent(R column, Object val) {
-        return likeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_LEFT), column, val);
-    }
-
-    default Children likeRightIfPresent(R column, Object val) {
-        return likeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.LIKE_RIGHT), column, val);
-    }
-
-    default Children notLikeLeftIfPresent(R column, Object val) {
-        return notLikeLeft(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_LEFT), column, val);
-    }
-
-    default Children notLikeRightIfPresent(R column, Object val) {
-        return notLikeRight(getIfPresent().test(val, IfPresentSqlKeyWordEnum.NOT_LIKE_RIGHT), column, val);
-    }
-}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
index 5aae207..7c5381e 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
 @SuppressWarnings({"unused", "DuplicatedCode"})
 public interface Query<Children> extends Serializable {
 
-
     List<Select> getSelectColum();
 
     Children getChildren();
@@ -100,7 +99,8 @@ public interface Query<Children> extends Serializable {
      * @param column 列
      */
     default <E> Children selectAs(String column, SFunction<E, ?> alias) {
-        getSelectColum().add(new SelectString(column + Constants.AS + LambdaUtils.getName(alias), LambdaUtils.getName(alias)));
+        String name = LambdaUtils.getName(alias);
+        getSelectColum().add(new SelectString(column + Constants.AS + name, name));
         return getChildren();
     }
 
@@ -112,8 +112,8 @@ public interface Query<Children> extends Serializable {
     default <E, X> Children selectAs(String index, SFunction<E, ?> column, SFunction<X, ?> alias) {
         Map<String, SelectCache> cacheMap = ColumnCache.getMapField(LambdaUtils.getEntityClass(column));
         SelectCache cache = cacheMap.get(LambdaUtils.getName(column));
-        getSelectColum().add(new SelectString(
-                index + Constants.DOT + cache.getColumn() + Constants.AS + LambdaUtils.getName(alias), LambdaUtils.getName(alias)));
+        String name = LambdaUtils.getName(alias);
+        getSelectColum().add(new SelectString(index + Constants.DOT + cache.getColumn() + Constants.AS + name, name));
         return getChildren();
     }
 
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/CustomWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/CustomWrapperTest.java
index d2114db..6a313b1 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/CustomWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/CustomWrapperTest.java
@@ -35,7 +35,7 @@ public class CustomWrapperTest {
         }
 
         @Override
-        public <X> CWrapper<T> eqIfPresent(SFunction<X, ?> column, Object val) {
+        public <X> CWrapper<T> eqIfExists(SFunction<X, ?> column, Object val) {
             super.eq(Objects.nonNull(val), column, val);
             return this;
         }
@@ -48,7 +48,7 @@ public class CustomWrapperTest {
                 .selectAll(UserDO.class)
 //                .toChildren(new Ref<CWrapper<UserDO>>())
                 .toChildren(CWrapper::toCWrapper)
-                .eqIfPresent(UserDO::getId, 1);
+                .eqIfExists(UserDO::getId, 1);
         List<UserDO> dos = userMapper.selectList(wrapper);
         dos.forEach(System.out::println);
 
@@ -57,7 +57,7 @@ public class CustomWrapperTest {
                 .selectAll(UserDO.class)
                 .toChildren(new Ref<CWrapper<UserDO>>())
 //                .toChildren(CWrapper::toCWrapper)
-                .eqIfPresent(UserDO::getId, null);
+                .eqIfExists(UserDO::getId, null);
         List<UserDO> dos1 = userMapper.selectList(wrapper1);
         dos1.forEach(System.out::println);
     }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfPresentTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfExistsTest.java
similarity index 53%
rename from mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfPresentTest.java
rename to mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfExistsTest.java
index 5101c39..0c1d97b 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfPresentTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/IfExistsTest.java
@@ -1,6 +1,6 @@
 package com.github.yulichang.test.join.m;
 
-import com.github.yulichang.config.enums.IfPresentEnum;
+import com.github.yulichang.config.enums.IfExistsEnum;
 import com.github.yulichang.test.join.entity.UserDO;
 import com.github.yulichang.test.util.Reset;
 import com.github.yulichang.test.util.ThreadLocalUtils;
@@ -13,7 +13,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import java.util.List;
 
 @SpringBootTest
-public class IfPresentTest {
+public class IfExistsTest {
 
     @BeforeEach
     void setUp() {
@@ -21,35 +21,35 @@ public class IfPresentTest {
     }
 
     @Test
-    void ifPresent() {
-        assert IfPresentEnum.NOT_EMPTY.test("\t");
-        assert !IfPresentEnum.NOT_EMPTY.test("");
-        assert IfPresentEnum.NOT_EMPTY.test(" ");
-        assert IfPresentEnum.NOT_EMPTY.test("\r");
-        assert IfPresentEnum.NOT_EMPTY.test("a");
-        assert IfPresentEnum.NOT_EMPTY.test(1);
-        assert IfPresentEnum.NOT_EMPTY.test(true);
-        assert IfPresentEnum.NOT_EMPTY.test('A');
+    void IfExists() {
+        assert IfExistsEnum.NOT_EMPTY.test("\t");
+        assert !IfExistsEnum.NOT_EMPTY.test("");
+        assert IfExistsEnum.NOT_EMPTY.test(" ");
+        assert IfExistsEnum.NOT_EMPTY.test("\r");
+        assert IfExistsEnum.NOT_EMPTY.test("a");
+        assert IfExistsEnum.NOT_EMPTY.test(1);
+        assert IfExistsEnum.NOT_EMPTY.test(true);
+        assert IfExistsEnum.NOT_EMPTY.test('A');
 
-        assert !IfPresentEnum.NOT_BLANK.test("\t");
-        assert !IfPresentEnum.NOT_BLANK.test("");
-        assert !IfPresentEnum.NOT_BLANK.test(" ");
-        assert !IfPresentEnum.NOT_BLANK.test("\r");
-        assert IfPresentEnum.NOT_BLANK.test("a");
-        assert IfPresentEnum.NOT_EMPTY.test(1);
-        assert IfPresentEnum.NOT_EMPTY.test(true);
-        assert IfPresentEnum.NOT_EMPTY.test('A');
+        assert !IfExistsEnum.NOT_BLANK.test("\t");
+        assert !IfExistsEnum.NOT_BLANK.test("");
+        assert !IfExistsEnum.NOT_BLANK.test(" ");
+        assert !IfExistsEnum.NOT_BLANK.test("\r");
+        assert IfExistsEnum.NOT_BLANK.test("a");
+        assert IfExistsEnum.NOT_EMPTY.test(1);
+        assert IfExistsEnum.NOT_EMPTY.test(true);
+        assert IfExistsEnum.NOT_EMPTY.test('A');
 
         ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
                 "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t " +
                 "WHERE t.del = false AND (t.id = ? AND t.head_img = ? AND t.`name` = ?)");
         MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
-                .eqIfPresent(UserDO::getId, 1)
-                .eqIfPresent(UserDO::getPid, null)
-                .eqIfPresent(UserDO::getAddressId, "")
-                .eqIfPresent(UserDO::getImg, "\t")
-                .eqIfPresent(UserDO::getName, "张三 1");
+                .eqIfExists(UserDO::getId, 1)
+                .eqIfExists(UserDO::getPid, null)
+                .eqIfExists(UserDO::getAddressId, "")
+                .eqIfExists(UserDO::getImg, "\t")
+                .eqIfExists(UserDO::getName, "张三 1");
         List<UserDO> list = wrapper.list();
         list.forEach(System.out::println);
 
@@ -58,12 +58,12 @@ public class IfPresentTest {
                 "WHERE t.del = false AND (t.id = ? AND t.`name` = ?)");
         MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
-                .setIfPresent(IfPresentEnum.NOT_BLANK)
-                .eqIfPresent(UserDO::getId, 1)
-                .eqIfPresent(UserDO::getPid, null)
-                .eqIfPresent(UserDO::getAddressId, "")
-                .eqIfPresent(UserDO::getImg, "\t")
-                .eqIfPresent(UserDO::getName, "张三 1");
+                .setIfExists(IfExistsEnum.NOT_BLANK)
+                .eqIfExists(UserDO::getId, 1)
+                .eqIfExists(UserDO::getPid, null)
+                .eqIfExists(UserDO::getAddressId, "")
+                .eqIfExists(UserDO::getImg, "\t")
+                .eqIfExists(UserDO::getName, "张三 1");
         List<UserDO> list1 = wrapper1.list();
         list1.forEach(System.out::println);
 
@@ -72,12 +72,12 @@ public class IfPresentTest {
                 "WHERE t.del = false AND (t.id = ? AND t.pid = ? AND t.`name` = ? AND t.head_img = ? AND t.`name` = ?)");
         MPJLambdaWrapper<UserDO> wrapper2 = JoinWrappers.lambda(UserDO.class)
                 .selectAll(UserDO.class)
-                .setIfPresent(o -> true)
-                .eqIfPresent(UserDO::getId, 1)
-                .eqIfPresent(UserDO::getPid, null)
-                .eqIfPresent(UserDO::getName, "")
-                .eqIfPresent(UserDO::getImg, "\t")
-                .eqIfPresent(UserDO::getName, "张三 1");
+                .setIfExists(o -> true)
+                .eqIfExists(UserDO::getId, 1)
+                .eqIfExists(UserDO::getPid, null)
+                .eqIfExists(UserDO::getName, "")
+                .eqIfExists(UserDO::getImg, "\t")
+                .eqIfExists(UserDO::getName, "张三 1");
         List<UserDO> list2 = wrapper2.list();
         list2.forEach(System.out::println);
     }
diff --git a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt
index 550f236..bcaf659 100644
--- a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt
+++ b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/m/CustomWrapperTest.kt
@@ -26,7 +26,7 @@ class CustomWrapperTest {
     //自定义wrapper扩展
     class CWrapper<T> : KtLambdaWrapper<T>() {
 
-        override fun eqIfPresent(column: KProperty<*>?, `val`: Any?): CWrapper<T> {
+        override fun eqIfExists(column: KProperty<*>?, `val`: Any?): CWrapper<T> {
             eq(Objects.nonNull(`val`), column, `val`)
             return this
         }
@@ -44,14 +44,14 @@ class CustomWrapperTest {
         val wrapper: CWrapper<UserDO> = CWrapper<UserDO>()
             .selectAll(UserDO::class.java)
             .toChildren<CWrapper<UserDO>> { CWrapper.toCWrapper() }
-            .eqIfPresent(UserDO::id, 1)
+            .eqIfExists(UserDO::id, 1)
         val dos = userMapper?.selectList(wrapper)
         dos?.forEach(System.out::println)
         ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false")
         val wrapper1: CWrapper<UserDO> = CWrapper<UserDO>()
             .selectAll(UserDO::class.java)
             .toChildren(Ref<CWrapper<UserDO>>())
-            .eqIfPresent(UserDO::id, null)
+            .eqIfExists(UserDO::id, null)
         val dos1 = userMapper?.selectList(wrapper1)
         dos1?.forEach(System.out::println)
     }

From fde21a04dd8e5cf69bcc38dd55646753fd935aa2 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 17 Jan 2024 16:34:55 +0800
Subject: [PATCH 68/88] =?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/toolkit/JSqlParserHelper.java   |  8 ++--
 .../wrapper/JoinAbstractLambdaWrapper.java    | 37 ++++++-------------
 .../test/join/LambdaWrapperTest.java          |  5 +++
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JSqlParserHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JSqlParserHelper.java
index 3473d84..b42c471 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JSqlParserHelper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JSqlParserHelper.java
@@ -36,15 +36,15 @@ public final class JSqlParserHelper {
                             SelectExpressionItem selectExpressionItem = (SelectExpressionItem) item;
                             if (null == selectExpressionItem.getAlias()) {
                                 if (selectExpressionItem.getExpression() instanceof Column) {
-                                    col = StringUtils.getTargetColumn(((Column) selectExpressionItem.getExpression()).getColumnName());
+                                    col = ((Column) selectExpressionItem.getExpression()).getColumnName();
                                 } else {
-                                    col = StringUtils.getTargetColumn(selectExpressionItem.getExpression().toString());
+                                    col = selectExpressionItem.getExpression().toString();
                                 }
                             } else {
-                                col = StringUtils.getTargetColumn(selectExpressionItem.getAlias().getName());
+                                col = selectExpressionItem.getAlias().getName();
                             }
                             if (StringUtils.isNotBlank(col)) {
-                                columConsumer.accept(col);
+                                columConsumer.accept(StringUtils.getTargetColumn(col));
                             }
                         }
                     }
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 61a7b05..66c6b7c 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
@@ -21,9 +21,7 @@ import lombok.Getter;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -371,30 +369,19 @@ public abstract class JoinAbstractLambdaWrapper<T, Children extends JoinAbstract
     /**
      * 检验表是否已连接
      */
-    public boolean checkJoinTable(Class clazz) {
-        TableInfo info = TableHelper.get(clazz);
-        Asserts.hasTable(info, clazz);
-        String tableName = info.getTableName();
-
-        for (Children wrapper : onWrappers) {
-            if (StringUtils.isBlank(wrapper.from.getStringValue())) {
-                if (this.subLogicSql && this.logicDelType == LogicDelTypeEnum.ON) {
-                    TableInfo tableInfo = TableHelper.get(wrapper.getJoinClass());
-                    if (tableInfo != null && tableName.equals(tableInfo.getTableName())) {
-                        return true;
-                    }
-                }
-                if (wrapper.getTableName().equals(tableName)) {
-                    return true;
-                }
+    public boolean checkJoinTable(Class<?> clazz) {
+        return onWrappers.stream().anyMatch(wrapper -> {
+            if (Objects.equals(wrapper.getJoinClass(), clazz)) {
+                return true;
             } else {
-                if (wrapper.from.getStringValue().contains(Constant.JOIN + StringPool.SPACE + tableName)) {
-                    return true;
-                }
+                TableInfo info = TableHelper.get(clazz);
+                Asserts.hasTable(info, clazz);
+                String tableName = info.getTableName();
+                return Optional.ofNullable(wrapper.from.getStringValue())
+                        .map(w -> w.contains(Constant.JOIN + StringPool.SPACE + tableName + StringPool.SPACE))
+                        .orElse(false);
             }
-        }
-
-        return false;
+        });
     }
 
     /**
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
index f95bd05..3733724 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java
@@ -130,6 +130,11 @@ class LambdaWrapperTest {
                 .orderByDesc(UserDO::getId);
         List<UserDTO> list = userMapper.selectJoinList(UserDTO.class, wrapper);
 
+        assert wrapper.checkJoinTable(AddressDO.class);
+        assert wrapper.checkJoinTable(AreaDO.class);
+        assert !wrapper.checkJoinTable(UserDO.class);
+        assert !wrapper.checkJoinTable(UserDto.class);
+
         assert list.get(0).getAddressList() != null && list.get(0).getAddressList().get(0).getId() != null;
         list.forEach(System.out::println);
     }

From 34e4acdc6ac39867f4b59b3533625d16e3a80203 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 17 Jan 2024 16:48:51 +0800
Subject: [PATCH 69/88] =?UTF-8?q?update=E5=92=8Cdelete=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=93=BE=E5=BC=8F=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/wrapper/DeleteJoinWrapper.java  |  3 +-
 .../yulichang/wrapper/UpdateJoinWrapper.java  |  3 +-
 .../wrapper/interfaces/DeleteChain.java       | 36 +++++++++
 .../wrapper/interfaces/UpdateChain.java       | 78 +++++++++++++++++++
 4 files changed, 118 insertions(+), 2 deletions(-)
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/DeleteChain.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/UpdateChain.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java
index 887c7d9..21e136b 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java
@@ -9,6 +9,7 @@ import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.LogicInfoUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.TableList;
+import com.github.yulichang.wrapper.interfaces.DeleteChain;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -21,7 +22,7 @@ import java.util.stream.Collectors;
  * @author yulichang
  * @since 1.4.5
  */
-public class DeleteJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, DeleteJoinWrapper<T>> {
+public class DeleteJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, DeleteJoinWrapper<T>> implements DeleteChain<T> {
 
     /**
      * 删除表
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
index 36f221d..478ddfc 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
@@ -12,6 +12,7 @@ import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.TableList;
 import com.github.yulichang.wrapper.interfaces.Update;
+import com.github.yulichang.wrapper.interfaces.UpdateChain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -29,7 +30,7 @@ import java.util.stream.Collectors;
  */
 @SuppressWarnings("unused")
 public class UpdateJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, UpdateJoinWrapper<T>>
-        implements Update<UpdateJoinWrapper<T>> {
+        implements Update<UpdateJoinWrapper<T>>, UpdateChain<T> {
     /**
      * SQL 更新字段内容，例如：name='1', age=2
      */
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/DeleteChain.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/DeleteChain.java
new file mode 100644
index 0000000..47ebf02
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/DeleteChain.java
@@ -0,0 +1,36 @@
+package com.github.yulichang.wrapper.interfaces;
+
+import com.baomidou.mybatisplus.core.toolkit.Assert;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.github.yulichang.interfaces.MPJBaseJoin;
+import com.github.yulichang.toolkit.SqlHelper;
+
+/**
+ * 链式调用
+ * <p>
+ * 构造方法必须传 class 或 entity 否则会报错<br />
+ * new DeleteJoinWrapper(User.class)<br />
+ * JoinWrappers.delete(User.class)<br />
+ *
+ * @author yulichang
+ * @since 1.4.10
+ */
+public interface DeleteChain<T> {
+
+    Class<T> getEntityClass();
+
+    /**
+     * 链式调用
+     * <p>
+     * 构造方法必须传 class 或 entity 否则会报错 <br />
+     * new DeleteJoinWrapper(User.class)<br />
+     * JoinWrappers.delete(User.class)<br />
+     */
+    @SuppressWarnings({"unused", "unchecked"})
+    default int deleteJoin() {
+        return SqlHelper.exec(getEntityClass(), mapper -> {
+            Assert.isTrue(mapper instanceof MPJBaseMapper, "mapper <%s> is not extends MPJBaseMapper", mapper.getClass().getSimpleName());
+            return ((MPJBaseMapper<T>) mapper).deleteJoin((MPJBaseJoin<T>) this);
+        });
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/UpdateChain.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/UpdateChain.java
new file mode 100644
index 0000000..30fb8eb
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/UpdateChain.java
@@ -0,0 +1,78 @@
+package com.github.yulichang.wrapper.interfaces;
+
+import com.baomidou.mybatisplus.core.toolkit.Assert;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.github.yulichang.interfaces.MPJBaseJoin;
+import com.github.yulichang.toolkit.SqlHelper;
+
+/**
+ * 链式调用
+ * <p>
+ * 构造方法必须传 class 或 entity 否则会报错<br />
+ * new UpdateJoinWrapper(User.class)<br />
+ * JoinWrappers.update(User.class)<br />
+ *
+ * @author yulichang
+ * @since 1.4.10
+ */
+@SuppressWarnings({"unchecked", "unused"})
+public interface UpdateChain<T> {
+
+    Class<T> getEntityClass();
+
+    /**
+     * 链式调用
+     * <p>
+     * 构造方法必须传 class 或 entity 否则会报错 <br />
+     * new UpdateJoinWrapper(User.class)<br />
+     * JoinWrappers.update(User.class)<br />
+     */
+    default int update() {
+        return SqlHelper.exec(getEntityClass(), mapper -> {
+            Assert.isTrue(mapper instanceof MPJBaseMapper, "mapper <%s> is not extends MPJBaseMapper", mapper.getClass().getSimpleName());
+            return ((MPJBaseMapper<T>) mapper).updateJoin(null, (MPJBaseJoin<T>) this);
+        });
+    }
+
+    /**
+     * 链式调用
+     * <p>
+     * 构造方法必须传 class 或 entity 否则会报错 <br />
+     * new UpdateJoinWrapper(User.class)<br />
+     * JoinWrappers.update(User.class)<br />
+     */
+    default int update(T entity) {
+        return SqlHelper.exec(getEntityClass(), mapper -> {
+            Assert.isTrue(mapper instanceof MPJBaseMapper, "mapper <%s> is not extends MPJBaseMapper", mapper.getClass().getSimpleName());
+            return ((MPJBaseMapper<T>) mapper).updateJoin(entity, (MPJBaseJoin<T>) this);
+        });
+    }
+
+    /**
+     * 链式调用
+     * <p>
+     * 构造方法必须传 class 或 entity 否则会报错 <br />
+     * new UpdateJoinWrapper(User.class)<br />
+     * JoinWrappers.update(User.class)<br />
+     */
+    default int updateAndNull() {
+        return SqlHelper.exec(getEntityClass(), mapper -> {
+            Assert.isTrue(mapper instanceof MPJBaseMapper, "mapper <%s> is not extends MPJBaseMapper", mapper.getClass().getSimpleName());
+            return ((MPJBaseMapper<T>) mapper).updateJoinAndNull(null, (MPJBaseJoin<T>) this);
+        });
+    }
+
+    /**
+     * 链式调用
+     * <p>
+     * 构造方法必须传 class 或 entity 否则会报错 <br />
+     * new UpdateJoinWrapper(User.class)<br />
+     * JoinWrappers.update(User.class)<br />
+     */
+    default int updateAndNull(T entity) {
+        return SqlHelper.exec(getEntityClass(), mapper -> {
+            Assert.isTrue(mapper instanceof MPJBaseMapper, "mapper <%s> is not extends MPJBaseMapper", mapper.getClass().getSimpleName());
+            return ((MPJBaseMapper<T>) mapper).updateJoinAndNull(entity, (MPJBaseJoin<T>) this);
+        });
+    }
+}

From 3ed76b8ca0168e33b056de123fe821d058cf7965 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 17 Jan 2024 17:05:13 +0800
Subject: [PATCH 70/88] =?UTF-8?q?update=E5=92=8Cdelete=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=93=BE=E5=BC=8F=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/kt/KtAbstractLambdaWrapper.java      |  6 ++----
 .../github/yulichang/kt/KtDeleteJoinWrapper.java   | 14 ++++++--------
 .../github/yulichang/kt/KtUpdateJoinWrapper.java   |  7 +++----
 .../com/github/yulichang/kt/interfaces/Query.java  |  7 ++-----
 .../yulichang/kt/resultmap/MybatisLabel.java       |  6 ++----
 .../yulichang/query/MPJLambdaQueryWrapper.java     |  7 ++-----
 .../github/yulichang/query/MPJQueryWrapper.java    |  7 ++-----
 .../github/yulichang/toolkit/KtWrapperUtils.java   |  6 ++----
 .../github/yulichang/toolkit/LogicInfoUtils.java   |  3 +--
 .../com/github/yulichang/toolkit/TableHelper.java  |  7 +++++++
 .../com/github/yulichang/toolkit/WrapperUtils.java |  6 ++----
 .../yulichang/toolkit/support/ColumnCache.java     |  4 +---
 .../yulichang/wrapper/DeleteJoinWrapper.java       | 13 +++++--------
 .../wrapper/JoinAbstractLambdaWrapper.java         |  6 ++----
 .../yulichang/wrapper/UpdateJoinWrapper.java       |  5 ++---
 .../github/yulichang/wrapper/interfaces/Query.java |  7 ++-----
 .../yulichang/wrapper/resultmap/MybatisLabel.java  |  4 +---
 .../yulichang/wrapper/segments/SelectCache.java    |  4 +---
 18 files changed, 45 insertions(+), 74 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java
index 743305f..374f93c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractLambdaWrapper.java
@@ -332,8 +332,7 @@ public abstract class KtAbstractLambdaWrapper<T, Children extends KtAbstractLamb
             for (Children wrapper : onWrappers) {
                 if (StringUtils.isBlank(wrapper.from.getStringValue())) {
                     if (this.subLogicSql && this.logicDelType == LogicDelTypeEnum.ON) {
-                        TableInfo tableInfo = TableHelper.get(wrapper.getJoinClass());
-                        Asserts.hasTable(tableInfo, wrapper.getJoinClass());
+                        TableInfo tableInfo = TableHelper.getAssert(wrapper.getJoinClass());
                         if (ConfigProperties.tableInfoAdapter.mpjHasLogic(tableInfo)) {
                             wrapper.appendSqlSegments(APPLY, () -> LogicInfoUtils.getLogicInfoNoAnd(
                                     wrapper.getIndex(), wrapper.getJoinClass(), wrapper.isHasAlias(), wrapper.getAlias()
@@ -368,8 +367,7 @@ public abstract class KtAbstractLambdaWrapper<T, Children extends KtAbstractLamb
     public Children join(String keyWord, Class<?> clazz, String tableAlias, BiConsumer<KtAbstractLambdaWrapper<?, ?>, Children> consumer) {
         Integer oldIndex = this.getIndex();
         int newIndex = tableIndex;
-        TableInfo info = TableHelper.get(clazz);
-        Asserts.hasTable(info, clazz);
+        TableInfo info = TableHelper.getAssert(clazz);
         Children instance = instance(newIndex, keyWord, clazz, info.getTableName());
         instance.isNo = true;
         instance.isMain = false;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java
index 406d7cd..8721079 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java
@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.adapter.AdapterHelper;
-import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.LogicInfoUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.TableList;
+import com.github.yulichang.wrapper.interfaces.DeleteChain;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
  * @since 1.4.5
  */
 @SuppressWarnings({"unused", "DuplicatedCode"})
-public class KtDeleteJoinWrapper<T> extends KtAbstractLambdaWrapper<T, KtDeleteJoinWrapper<T>> {
+public class KtDeleteJoinWrapper<T> extends KtAbstractLambdaWrapper<T, KtDeleteJoinWrapper<T>> implements DeleteChain<T> {
 
     /**
      * 删除表
@@ -166,21 +166,19 @@ public class KtDeleteJoinWrapper<T> extends KtAbstractLambdaWrapper<T, KtDeleteJ
 
     private void check(List<Class<?>> classList) {
         Class<T> entityClass = getEntityClass();
-        TableInfo tableInfo = TableHelper.get(entityClass);
-        Asserts.hasTable(tableInfo, entityClass);
+        TableInfo tableInfo = TableHelper.getAssert(entityClass);
         //检查
         boolean mainLogic = AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo);
         boolean check = classList.stream().allMatch(t -> {
-            TableInfo ti = TableHelper.get(t);
-            Asserts.hasTable(ti, t);
+            TableInfo ti = TableHelper.getAssert(t);
             return mainLogic == AdapterHelper.getTableInfoAdapter().mpjHasLogic(ti);
         });
         if (!check) {
             throw ExceptionUtils.mpe("连表删除只适用于全部表(主表和副表)都是物理删除或全部都是逻辑删除, " +
                             "不支持同时存在物理删除和逻辑删除 [物理删除->(%s)] [逻辑删除->(%s)]",
-                    classList.stream().filter(t -> !AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.get(t)))
+                    classList.stream().filter(t -> !AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.getAssert(t)))
                             .map(Class::getSimpleName).collect(Collectors.joining(StringPool.COMMA)),
-                    classList.stream().filter(t -> AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.get(t)))
+                    classList.stream().filter(t -> AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.getAssert(t)))
                             .map(Class::getSimpleName).collect(Collectors.joining(StringPool.COMMA)));
         }
     }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java
index 54c96fd..d6ac0cf 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java
@@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.adapter.AdapterHelper;
 import com.github.yulichang.kt.interfaces.Update;
-import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.KtUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.TableList;
+import com.github.yulichang.wrapper.interfaces.UpdateChain;
 import kotlin.reflect.KProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
  */
 @SuppressWarnings({"unused", "DuplicatedCode"})
 public class KtUpdateJoinWrapper<T> extends KtAbstractLambdaWrapper<T, KtUpdateJoinWrapper<T>>
-        implements Update<KtUpdateJoinWrapper<T>> {
+        implements Update<KtUpdateJoinWrapper<T>>, UpdateChain<T> {
     /**
      * SQL 更新字段内容，例如：name='1', age=2
      */
@@ -199,8 +199,7 @@ public class KtUpdateJoinWrapper<T> extends KtAbstractLambdaWrapper<T, KtUpdateJ
     private void getSqlByEntity(StringBuilder sb, boolean filterNull, List<Object> entityList) {
         for (Object obj : entityList) {
             Assert.isTrue(tableList.contain(obj.getClass()), "更新的实体不是主表或关联表 <%>", obj.getClass().getSimpleName());
-            TableInfo tableInfo = TableHelper.get(obj.getClass());
-            Asserts.hasTable(tableInfo, obj.getClass());
+            TableInfo tableInfo = TableHelper.getAssert(obj.getClass());
             for (TableFieldInfo fieldInfo : tableInfo.getFieldList()) {
                 if (AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo) && fieldInfo.isLogicDelete()) {
                     continue;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
index 33729fe..7cd6bef 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.yulichang.kt.segments.FuncArgs;
-import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.KtUtils;
 import com.github.yulichang.toolkit.MPJReflectionKit;
 import com.github.yulichang.toolkit.TableHelper;
@@ -53,8 +52,7 @@ public interface Query<Children> extends Serializable {
      */
     @Deprecated
     default Children select(Class<?> entityClass, Predicate<TableFieldInfo> predicate) {
-        TableInfo info = TableHelper.get(entityClass);
-        Asserts.hasTable(info, entityClass);
+        TableInfo info = TableHelper.getAssert(entityClass);
         Map<String, SelectCache> cacheMap = ColumnCache.getMapField(entityClass);
         info.getFieldList().stream().filter(predicate).collect(Collectors.toList()).forEach(
                 i -> getSelectColum().add(new SelectNormal(cacheMap.get(i.getProperty()), getIndex(), isHasAlias(), getAlias())));
@@ -73,8 +71,7 @@ public interface Query<Children> extends Serializable {
      * @return children
      */
     default Children selectFilter(Class<?> entityClass, Predicate<SelectCache> predicate) {
-        TableInfo info = TableHelper.get(entityClass);
-        Asserts.hasTable(info, entityClass);
+        TableInfo info = TableHelper.getAssert(entityClass);
         List<SelectCache> cacheList = ColumnCache.getListField(entityClass);
         cacheList.stream().filter(predicate).collect(Collectors.toList()).forEach(
                 i -> getSelectColum().add(new SelectNormal(i, getIndex(), isHasAlias(), getAlias())));
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabel.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabel.java
index e14fa9c..4674297 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabel.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/resultmap/MybatisLabel.java
@@ -3,7 +3,6 @@ package com.github.yulichang.kt.resultmap;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.KtUtils;
 import com.github.yulichang.toolkit.MPJReflectionKit;
 import com.github.yulichang.toolkit.TableHelper;
@@ -145,7 +144,7 @@ public class MybatisLabel<E, T> implements Label<T> {
         /**
          * 嵌套
          */
-        public  Builder<E, T> collection(String prefix, Class<?> entityClass, KProperty<?> func) {
+        public Builder<E, T> collection(String prefix, Class<?> entityClass, KProperty<?> func) {
             String dtoFieldName = func.getName();
             Map<String, FieldCache> fieldMap = MPJReflectionKit.getFieldMap(KtUtils.ref(func));
             FieldCache field = fieldMap.get(dtoFieldName);
@@ -254,8 +253,7 @@ public class MybatisLabel<E, T> implements Label<T> {
         }
 
         private void autoBuild(boolean auto, Class<E> entityClass, Class<T> tagClass) {
-            TableInfo tableInfo = TableHelper.get(entityClass);
-            Asserts.hasTable(tableInfo, entityClass);
+            TableInfo tableInfo = TableHelper.getAssert(entityClass);
             Map<String, FieldCache> tagMap = MPJReflectionKit.getFieldMap(tagClass);
             if (auto && !tagMap.isEmpty()) {
                 List<SelectCache> listField = ColumnCache.getListField(entityClass);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
index d03e725..dde0ee7 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java
@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.query.interfaces.CompareIfExists;
 import com.github.yulichang.query.interfaces.StringJoin;
-import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.ThrowOptional;
 import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
@@ -194,8 +193,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
      */
     @Override
     public MPJLambdaQueryWrapper<T> select(Class<T> entityClass, Predicate<TableFieldInfo> predicate) {
-        TableInfo info = TableHelper.get(entityClass);
-        Asserts.hasTable(info, entityClass);
+        TableInfo info = TableHelper.getAssert(entityClass);
         selectColumns.addAll(info.getFieldList().stream().filter(predicate).map(c ->
                 alias + StringPool.DOT + c.getColumn()).collect(Collectors.toList()));
         return typedThis;
@@ -219,8 +217,7 @@ public class MPJLambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, MPJLambda
      */
     @SuppressWarnings("DuplicatedCode")
     public final MPJLambdaQueryWrapper<T> selectAll(Class<?> clazz, String as) {
-        TableInfo info = TableHelper.get(clazz);
-        Asserts.hasTable(info, clazz);
+        TableInfo info = TableHelper.getAssert(clazz);
         if (info.havePK()) {
             selectColumns.add(as + StringPool.DOT + info.getKeyColumn());
         }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
index 68c8df1..4f46924 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java
@@ -13,7 +13,6 @@ import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.query.interfaces.CompareIfExists;
 import com.github.yulichang.query.interfaces.StringJoin;
-import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.MPJSqlInjectionUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.ThrowOptional;
@@ -215,8 +214,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
      */
     @Override
     public MPJQueryWrapper<T> select(Class<T> entityClass, Predicate<TableFieldInfo> predicate) {
-        TableInfo info = TableHelper.get(entityClass);
-        Asserts.hasTable(info, entityClass);
+        TableInfo info = TableHelper.getAssert(entityClass);
         selectColumns.addAll(info.getFieldList().stream().filter(predicate).map(c ->
                 alias + StringPool.DOT + c.getSqlSelect()).collect(Collectors.toList()));
         return typedThis;
@@ -240,8 +238,7 @@ public class MPJQueryWrapper<T> extends AbstractWrapper<T, String, MPJQueryWrapp
      */
     @SuppressWarnings({"DuplicatedCode", "UnusedReturnValue"})
     public final MPJQueryWrapper<T> selectAll(Class<?> clazz, String as) {
-        TableInfo info = TableHelper.get(clazz);
-        Asserts.hasTable(info, clazz);
+        TableInfo info = TableHelper.getAssert(clazz);
         if (ConfigProperties.tableInfoAdapter.mpjHasPK(info)) {
             selectColumns.add(as + StringPool.DOT + info.getKeySqlSelect());
         }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
index 242fb92..d980af0 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
@@ -20,8 +20,7 @@ import java.util.Optional;
 public class KtWrapperUtils {
 
     public static String buildSubSqlByWrapper(Class<?> clazz, KtLambdaWrapper<?> wrapper, String alias) {
-        TableInfo tableInfo = TableHelper.get(clazz);
-        Asserts.hasTable(tableInfo, clazz);
+        TableInfo tableInfo = TableHelper.getAssert(clazz);
         String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY);
         boolean hasWhere = false;
         String entityWhere = getEntitySql(tableInfo, wrapper);
@@ -54,8 +53,7 @@ public class KtWrapperUtils {
     }
 
     public static String buildUnionSqlByWrapper(Class<?> clazz, KtLambdaWrapper<?> wrapper) {
-        TableInfo tableInfo = TableHelper.get(clazz);
-        Asserts.hasTable(tableInfo, clazz);
+        TableInfo tableInfo = TableHelper.getAssert(clazz);
         String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY);
         boolean hasWhere = false;
         String entityWhere = getEntitySql(tableInfo, wrapper);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LogicInfoUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LogicInfoUtils.java
index ed2ff2e..d18849e 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LogicInfoUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/LogicInfoUtils.java
@@ -53,8 +53,7 @@ public class LogicInfoUtils implements Constants {
 
     private static String getLogicStr(String prefix, Class<?> clazz, boolean and, boolean invert) {
         String logicStr;
-        TableInfo tableInfo = TableHelper.get(clazz);
-        Asserts.hasTable(tableInfo, clazz);
+        TableInfo tableInfo = TableHelper.getAssert(clazz);
         TableFieldInfo logicField = ConfigProperties.tableInfoAdapter.mpjGetLogicField(tableInfo);
         if (ConfigProperties.tableInfoAdapter.mpjHasLogic(tableInfo) && Objects.nonNull(logicField)) {
             final String notDeleteValue = logicField.getLogicNotDeleteValue();
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java
index 5de0cfd..f856a5f 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/TableHelper.java
@@ -63,4 +63,11 @@ public class TableHelper {
             return null;
         }
     }
+
+    public static TableInfo getAssert(Class<?> clazz) {
+        Objects.requireNonNull(clazz);
+        TableInfo tableInfo = get(clazz);
+        Asserts.hasTable(tableInfo, clazz);
+        return tableInfo;
+    }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java
index 7603cc6..910f0f2 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java
@@ -20,8 +20,7 @@ import java.util.Optional;
 public class WrapperUtils {
 
     public static <T> String buildSubSqlByWrapper(Class<T> clazz, MPJLambdaWrapper<T> wrapper, String alias) {
-        TableInfo tableInfo = TableHelper.get(clazz);
-        Asserts.hasTable(tableInfo, clazz);
+        TableInfo tableInfo = TableHelper.getAssert(clazz);
         String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY);
         boolean hasWhere = false;
         String entityWhere = getEntitySql(tableInfo, wrapper);
@@ -54,8 +53,7 @@ public class WrapperUtils {
     }
 
     public static String buildUnionSqlByWrapper(Class<?> clazz, MPJLambdaWrapper<?> wrapper) {
-        TableInfo tableInfo = TableHelper.get(clazz);
-        Asserts.hasTable(tableInfo, clazz);
+        TableInfo tableInfo = TableHelper.getAssert(clazz);
         String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY);
         boolean hasWhere = false;
         String entityWhere = getEntitySql(tableInfo, wrapper);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java
index 214e037..9515c7e 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/support/ColumnCache.java
@@ -2,7 +2,6 @@ package com.github.yulichang.toolkit.support;
 
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.FieldStringMap;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.wrapper.segments.SelectCache;
@@ -29,8 +28,7 @@ public class ColumnCache {
 
     public static List<SelectCache> getListField(Class<?> clazz) {
         return LIST_CACHE.computeIfAbsent(clazz, c -> {
-            TableInfo tableInfo = TableHelper.get(clazz);
-            Asserts.hasTable(tableInfo, c);
+            TableInfo tableInfo = TableHelper.getAssert(clazz);
             List<SelectCache> list = new ArrayList<>();
             if (ConfigProperties.tableInfoAdapter.mpjHasPK(tableInfo)) {
                 list.add(new SelectCache(clazz, true, tableInfo.getKeyColumn(), tableInfo.getKeyType(),
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java
index 21e136b..bfbb174 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.adapter.AdapterHelper;
-import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.LogicInfoUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.TableList;
@@ -167,24 +166,22 @@ public class DeleteJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, DeleteJoi
         return typedThis;
     }
 
-    @SuppressWarnings({"DuplicatedCode", "DataFlowIssue"})
+    @SuppressWarnings("DuplicatedCode")
     private void check(List<Class<?>> classList) {
         Class<T> entityClass = getEntityClass();
-        TableInfo tableInfo = TableHelper.get(entityClass);
-        Asserts.hasTable(tableInfo, entityClass);
+        TableInfo tableInfo = TableHelper.getAssert(entityClass);
         //检查
         boolean mainLogic = AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo);
         boolean check = classList.stream().allMatch(t -> {
-            TableInfo ti = TableHelper.get(t);
-            Asserts.hasTable(ti, t);
+            TableInfo ti = TableHelper.getAssert(t);
             return mainLogic == AdapterHelper.getTableInfoAdapter().mpjHasLogic(ti);
         });
         if (!check) {
             throw ExceptionUtils.mpe("连表删除只适用于全部表(主表和副表)都是物理删除或全部都是逻辑删除, " +
                             "不支持同时存在物理删除和逻辑删除 [物理删除->(%s)] [逻辑删除->(%s)]",
-                    classList.stream().filter(t -> !AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.get(t)))
+                    classList.stream().filter(t -> !AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.getAssert(t)))
                             .map(Class::getSimpleName).collect(Collectors.joining(StringPool.COMMA)),
-                    classList.stream().filter(t -> AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.get(t)))
+                    classList.stream().filter(t -> AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.getAssert(t)))
                             .map(Class::getSimpleName).collect(Collectors.joining(StringPool.COMMA)));
         }
     }
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 66c6b7c..7df36fc 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
@@ -374,8 +374,7 @@ public abstract class JoinAbstractLambdaWrapper<T, Children extends JoinAbstract
             if (Objects.equals(wrapper.getJoinClass(), clazz)) {
                 return true;
             } else {
-                TableInfo info = TableHelper.get(clazz);
-                Asserts.hasTable(info, clazz);
+                TableInfo info = TableHelper.getAssert(clazz);
                 String tableName = info.getTableName();
                 return Optional.ofNullable(wrapper.from.getStringValue())
                         .map(w -> w.contains(Constant.JOIN + StringPool.SPACE + tableName + StringPool.SPACE))
@@ -391,8 +390,7 @@ public abstract class JoinAbstractLambdaWrapper<T, Children extends JoinAbstract
     public <R> Children join(String keyWord, Class<R> clazz, String tableAlias, BiConsumer<JoinAbstractLambdaWrapper<T, ?>, Children> consumer) {
         Integer oldIndex = this.getIndex();
         int newIndex = tableIndex;
-        TableInfo info = TableHelper.get(clazz);
-        Asserts.hasTable(info, clazz);
+        TableInfo info = TableHelper.getAssert(clazz);
         Children instance = instance(newIndex, keyWord, clazz, info.getTableName());
         instance.isOn = true;
         instance.isMain = false;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
index 478ddfc..1df4243 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.adapter.AdapterHelper;
-import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.TableList;
@@ -198,11 +197,11 @@ public class UpdateJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, UpdateJoi
         this.tableName = tableName;
     }
 
+    @SuppressWarnings("DuplicatedCode")
     private void getSqlByEntity(StringBuilder sb, boolean filterNull, List<Object> entityList) {
         for (Object obj : entityList) {
             Assert.isTrue(tableList.contain(obj.getClass()), "更新的实体不是主表或关联表 <%>", obj.getClass().getSimpleName());
-            TableInfo tableInfo = TableHelper.get(obj.getClass());
-            Asserts.hasTable(tableInfo, obj.getClass());
+            TableInfo tableInfo = TableHelper.getAssert(obj.getClass());
             for (TableFieldInfo fieldInfo : tableInfo.getFieldList()) {
                 if (AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo) && fieldInfo.isLogicDelete()) {
                     continue;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
index 7c5381e..8a7e4dc 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.MPJReflectionKit;
 import com.github.yulichang.toolkit.TableHelper;
@@ -51,8 +50,7 @@ public interface Query<Children> extends Serializable {
      */
     @Deprecated
     default <E> Children select(Class<E> entityClass, Predicate<TableFieldInfo> predicate) {
-        TableInfo info = TableHelper.get(entityClass);
-        Asserts.hasTable(info, entityClass);
+        TableInfo info = TableHelper.getAssert(entityClass);
         Map<String, SelectCache> cacheMap = ColumnCache.getMapField(entityClass);
         info.getFieldList().stream().filter(predicate).collect(Collectors.toList()).forEach(
                 i -> getSelectColum().add(new SelectNormal(cacheMap.get(i.getProperty()), getIndex(), isHasAlias(), getAlias())));
@@ -71,8 +69,7 @@ public interface Query<Children> extends Serializable {
      * @return children
      */
     default <E> Children selectFilter(Class<E> entityClass, Predicate<SelectCache> predicate) {
-        TableInfo info = TableHelper.get(entityClass);
-        Asserts.hasTable(info, entityClass);
+        TableInfo info = TableHelper.getAssert(entityClass);
         List<SelectCache> cacheList = ColumnCache.getListField(entityClass);
         cacheList.stream().filter(predicate).collect(Collectors.toList()).forEach(
                 i -> getSelectColum().add(new SelectNormal(i, getIndex(), isHasAlias(), getAlias())));
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java
index f029fd1..0ab6ede 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/MybatisLabel.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.MPJReflectionKit;
 import com.github.yulichang.toolkit.TableHelper;
@@ -257,8 +256,7 @@ public class MybatisLabel<E, T> implements Label<T> {
         }
 
         private void autoBuild(boolean auto, Class<E> entityClass, Class<T> tagClass) {
-            TableInfo tableInfo = TableHelper.get(entityClass);
-            Asserts.hasTable(tableInfo, entityClass);
+            TableInfo tableInfo = TableHelper.getAssert(entityClass);
             Map<String, FieldCache> tagMap = MPJReflectionKit.getFieldMap(tagClass);
             if (auto && !tagMap.isEmpty()) {
                 List<SelectCache> listField = ColumnCache.getListField(entityClass);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectCache.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectCache.java
index 9a8da43..6ed4942 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectCache.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectCache.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.yulichang.config.ConfigProperties;
-import com.github.yulichang.toolkit.Asserts;
 import com.github.yulichang.toolkit.TableHelper;
 import lombok.Getter;
 import org.apache.ibatis.session.Configuration;
@@ -84,8 +83,7 @@ public class SelectCache {
         } else {
             this.hasTypeHandle = this.tableFieldInfo.getTypeHandler() != null && tableFieldInfo.getTypeHandler() != UnknownTypeHandler.class;
             if (this.hasTypeHandle) {
-                TableInfo info = TableHelper.get(clazz);
-                Asserts.hasTable(info, clazz);
+                TableInfo info = TableHelper.getAssert(clazz);
                 this.typeHandler = getTypeHandler(ConfigProperties.tableInfoAdapter.mpjGetConfiguration(info), tableFieldInfo);
             } else {
                 this.typeHandler = null;

From 0a6d71a328e6d00bf154fbb5e5ac3d4f5b34af0b Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 17 Jan 2024 19:10:24 +0800
Subject: [PATCH 71/88] 1.4.10

---
 README-zh.md                                  |  5 ++-
 README.md                                     |  5 ++-
 .../config/MPJInterceptorConfig.java          |  2 +-
 mybatis-plus-join-test/pom.xml                |  2 +-
 .../test-springboot3-jdk17/pom.xml            | 32 ++++++++++++++++++-
 mybatis-plus-join/pom.xml                     |  2 +-
 pom.xml                                       |  2 +-
 7 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index 3d4d970..d9d5e29 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -15,7 +15,6 @@
   <a href="https://gitee.com/best_handsome/mybatis-plus-join" target="_blank">
     <img src="https://gitee.com/best_handsome/mybatis-plus-join/badge/star.svg?theme=dark" alt=""/>
   </a>
-  <br/>
   <a href="https://central.sonatype.com/artifact/com.github.yulichang/mybatis-plus-join-boot-starter">
     <img alt="maven" src="https://img.shields.io/maven-central/v/com.github.yulichang/mybatis-plus-join-boot-starter.svg?style=flat-square">
   </a>
@@ -49,12 +48,12 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.9</version>
+      <version>1.4.10</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.9'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.10'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/README.md b/README.md
index d9dba93..7b779cf 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,6 @@
   <a href="https://gitee.com/best_handsome/mybatis-plus-join" target="_blank">
     <img src="https://gitee.com/best_handsome/mybatis-plus-join/badge/star.svg?theme=dark" alt=""/>
   </a>
-  <br/>
   <a href="https://central.sonatype.com/artifact/com.github.yulichang/mybatis-plus-join-boot-starter">
     <img alt="maven" src="https://img.shields.io/maven-central/v/com.github.yulichang/mybatis-plus-join-boot-starter.svg?style=flat-square">
   </a>
@@ -47,12 +46,12 @@ QQ群:1022221898  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.9</version>
+      <version>1.4.10</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.9'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.10'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
index ccef440..b0b2425 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
@@ -30,7 +30,7 @@ public class MPJInterceptorConfig {
             System.out.println(" _ _   |_  _ _|_. ___ _ |    _  .  _  .  _  \n" +
                     "| | |\\/|_)(_| | |_\\  |_)||_|_\\  | (_) | | | \n" +
                     "     /               |          /\n" +
-                    "                                    1.4.9");
+                    "                                    1.4.10");
         }
     }
 
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index 8ee3b2a..9c3ac12 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -50,7 +50,7 @@
     </scm>
 
     <properties>
-        <revision>1.4.9</revision>
+        <revision>1.4.10</revision>
         <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>
diff --git a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
index 8f66fac..65bf793 100644
--- a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
+++ b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
@@ -14,7 +14,7 @@
     <artifactId>test-springboot3-jdk17</artifactId>
 
     <properties>
-        <revision>1.4.9</revision>
+        <revision>1.4.10</revision>
         <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
 
         <maven.compiler.source>17</maven.compiler.source>
@@ -88,4 +88,34 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <configuration>
+                    <!-- 是否更新pom文件，此处还有更高级的用法 -->
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/mybatis-plus-join/pom.xml b/mybatis-plus-join/pom.xml
index 5486ac5..188c731 100644
--- a/mybatis-plus-join/pom.xml
+++ b/mybatis-plus-join/pom.xml
@@ -41,7 +41,7 @@
     </scm>
 
     <properties>
-        <revision>1.4.9</revision>
+        <revision>1.4.10</revision>
 
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>
diff --git a/pom.xml b/pom.xml
index 9a9b697..bf0625a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
     </modules>
 
     <properties>
-        <revision>1.4.9</revision>
+        <revision>1.4.10</revision>
         <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>

From 321747ecba27cfb86b848e3f050b7b1c1144fceb Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Thu, 18 Jan 2024 11:53:00 +0800
Subject: [PATCH 72/88] readme

---
 README-zh.md |  3 +--
 README.md    | 15 +++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index d9d5e29..9dea7e9 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -18,7 +18,6 @@
   <a href="https://central.sonatype.com/artifact/com.github.yulichang/mybatis-plus-join-boot-starter">
     <img alt="maven" src="https://img.shields.io/maven-central/v/com.github.yulichang/mybatis-plus-join-boot-starter.svg?style=flat-square">
   </a>
-
   <a href="https://www.apache.org/licenses/LICENSE-2.0">
     <img alt="code style" src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square">
   </a>
@@ -31,7 +30,7 @@
 </p>
 
 <p align="center">
-QQ群:1022221898  或者 
+QQ群:680016987  或者 
 <a href="https://gitee.com/best_handsome/mybatis-plus-join/issues/I65N2M" target="_blank">添加作者微信，备注MPJ，加入微信群</a>  
 <br/>
 <img width="200px" height="200px" src="https://mybatisplusjoin.com/qr.png"  alt="添加作者微信，备注MPJ，加入微信群"/>
diff --git a/README.md b/README.md
index 7b779cf..c32c63f 100644
--- a/README.md
+++ b/README.md
@@ -9,19 +9,18 @@
   为简化开发工作、提高生产率而生
 </p>
 <p align="center">
+  <a href="https://central.sonatype.com/artifact/com.github.yulichang/mybatis-plus-join-boot-starter">
+    <img alt="maven" src="https://img.shields.io/maven-central/v/com.github.yulichang/mybatis-plus-join-boot-starter.svg?style=flat-square">
+  </a>
+  <a href="https://www.apache.org/licenses/LICENSE-2.0">
+    <img alt="code style" src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square">
+  </a>
   <a href="https://github.com/yulichang/mybatis-plus-join" target="_blank">
     <img src="https://img.shields.io/github/stars/yulichang/mybatis-plus-join.svg?style=social&label=Stars" alt=""/>
   </a>
   <a href="https://gitee.com/best_handsome/mybatis-plus-join" target="_blank">
     <img src="https://gitee.com/best_handsome/mybatis-plus-join/badge/star.svg?theme=dark" alt=""/>
   </a>
-  <a href="https://central.sonatype.com/artifact/com.github.yulichang/mybatis-plus-join-boot-starter">
-    <img alt="maven" src="https://img.shields.io/maven-central/v/com.github.yulichang/mybatis-plus-join-boot-starter.svg?style=flat-square">
-  </a>
-
-  <a href="https://www.apache.org/licenses/LICENSE-2.0">
-    <img alt="code style" src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square">
-  </a>
 </p>
 <p align="center">
 对 <a href="https://gitee.com/baomidou/mybatis-plus" target="_blank">MyBatis-Plus</a> 多表查询的扩展 |
@@ -31,7 +30,7 @@
 </p>
 
 <p align="center">
-QQ群:1022221898  或者 
+QQ群:680016987  或者 
 <a href="https://gitee.com/best_handsome/mybatis-plus-join/issues/I65N2M" target="_blank">添加作者微信，备注MPJ，加入微信群</a>
 </p>
 

From fe3e139826dad761f715f22c2103ec006b88a9a5 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Thu, 18 Jan 2024 11:54:24 +0800
Subject: [PATCH 73/88] readme

---
 README-zh.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index 9dea7e9..2e0e25d 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -9,18 +9,18 @@
   为简化开发工作、提高生产率而生
 </p>
 <p align="center">
-  <a href="https://github.com/yulichang/mybatis-plus-join" target="_blank">
-    <img src="https://img.shields.io/github/stars/yulichang/mybatis-plus-join.svg?style=social&label=Stars" alt=""/>
-  </a>
-  <a href="https://gitee.com/best_handsome/mybatis-plus-join" target="_blank">
-    <img src="https://gitee.com/best_handsome/mybatis-plus-join/badge/star.svg?theme=dark" alt=""/>
-  </a>
   <a href="https://central.sonatype.com/artifact/com.github.yulichang/mybatis-plus-join-boot-starter">
     <img alt="maven" src="https://img.shields.io/maven-central/v/com.github.yulichang/mybatis-plus-join-boot-starter.svg?style=flat-square">
   </a>
   <a href="https://www.apache.org/licenses/LICENSE-2.0">
     <img alt="code style" src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square">
   </a>
+  <a href="https://github.com/yulichang/mybatis-plus-join" target="_blank">
+    <img src="https://img.shields.io/github/stars/yulichang/mybatis-plus-join.svg?style=social&label=Stars" alt=""/>
+  </a>
+  <a href="https://gitee.com/best_handsome/mybatis-plus-join" target="_blank">
+    <img src="https://gitee.com/best_handsome/mybatis-plus-join/badge/star.svg?theme=dark" alt=""/>
+  </a>
 </p>
 <p align="center">
 对 <a href="https://gitee.com/baomidou/mybatis-plus" target="_blank">MyBatis-Plus</a> 多表查询的扩展 |

From 0db41de3dae2a609ce377a9dacfaa263b89944be Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Thu, 18 Jan 2024 13:25:48 +0800
Subject: [PATCH 74/88] =?UTF-8?q?fix=20on=20=E9=85=8D=E7=BD=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatisplusjoin/solon/plugin/XPluginImpl.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
index b7bcf07..fac0584 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
@@ -56,8 +56,8 @@ public class XPluginImpl implements Plugin {
         ConfigProperties.tableAlias = prop.get("tableAlias", Function.identity());
         ConfigProperties.joinPrefix = prop.get("joinPrefix", Function.identity());
         ConfigProperties.logicDelType = prop.get("logicDelType", val ->
-                Arrays.stream(LogicDelTypeEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()
-                        .orElseThrow(() -> ExceptionUtils.mpe("mybatis-plus-join.logicDelType 配置错误")));
+                // fix on/off yes/no 会转为Boolean
+                LogicDelTypeEnum.WHERE.name().equalsIgnoreCase(val) ? LogicDelTypeEnum.WHERE : LogicDelTypeEnum.ON);
         ConfigProperties.mappingMaxCount = prop.get("mappingMaxCount", Integer::parseInt);
         ConfigProperties.ifExists = prop.get("ifExists", val ->
                 Arrays.stream(IfExistsEnum.values()).filter(e -> e.name().equalsIgnoreCase(val)).findFirst()
@@ -78,8 +78,8 @@ public class XPluginImpl implements Plugin {
 
         public Prop(Props props) {
             this.props = props.entrySet().stream().filter(e -> format(e.getKey())
-                    .startsWith(format("mybatis-plus-join."))).collect(Collectors.toMap(e -> e.getKey().toString()
-                    .substring(e.getKey().toString().lastIndexOf(".") + 1)
+                    .startsWith(format("mybatis-plus-join."))).collect(Collectors.toMap(e -> format(e.getKey())
+                    .substring(e.getKey().toString().indexOf(".") + 1)
                     .toUpperCase(Locale.ENGLISH), Map.Entry::getValue, (o, n) -> n, Properties::new));
         }
 

From f45a8073393df3c9c8923f66ea0814bdb403a16c Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 19 Jan 2024 22:51:03 +0800
Subject: [PATCH 75/88] =?UTF-8?q?SelectFunc=20=E5=AD=97=E6=AE=B5=E5=88=AB?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/kt/segments/FuncArgs.java       |  2 +-
 .../yulichang/wrapper/MPJLambdaWrapper.java   |  4 +-
 .../yulichang/wrapper/interfaces/Query.java   | 19 ++++++-
 .../wrapper/segments/SelectFunc.java          | 29 ++++++-----
 .../yulichang/test/join/m/FuncAliasTest.java  | 49 +++++++++++++++++++
 5 files changed, 87 insertions(+), 16 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/FuncAliasTest.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/segments/FuncArgs.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/segments/FuncArgs.java
index dfe52da..aa4f413 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/segments/FuncArgs.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/segments/FuncArgs.java
@@ -16,7 +16,7 @@ import java.util.Arrays;
 public class FuncArgs {
 
     public SelectFunc.Arg[] accept(KProperty<?>... kProperty) {
-        return Arrays.stream(kProperty).map(i -> new SelectFunc.Arg(KtUtils.ref(i), i.getName())).toArray(SelectFunc.Arg[]::new);
+        return Arrays.stream(kProperty).map(i -> new SelectFunc.Arg(KtUtils.ref(i), i.getName(), false, null)).toArray(SelectFunc.Arg[]::new);
     }
 
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index 17367ec..c043b1e 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -367,10 +367,10 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
                         return String.format(i.getFunc().getSql(), str) + Constant.AS + i.getAlias();
                     } else {
                         return String.format(i.getFunc().getSql(), Arrays.stream(args).map(arg -> {
-                            String prefixByClass = tableList.getPrefixByClass(arg.getClazz());
+                            String pf = arg.isHasTableAlias() ? arg.getTableAlias() : tableList.getPrefixByClass(arg.getClazz());
                             Map<String, SelectCache> mapField = ColumnCache.getMapField(arg.getClazz());
                             SelectCache cache = mapField.get(arg.getProp());
-                            return prefixByClass + StringPool.DOT + cache.getColumn();
+                            return pf + StringPool.DOT + cache.getColumn();
                         }).toArray()) + Constant.AS + i.getAlias();
                     }
                 } else {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
index 8a7e4dc..a624a20 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
@@ -201,28 +201,43 @@ public interface Query<Children> extends Serializable {
         return getChildren();
     }
 
+    default <S> Children selectFunc(BaseFuncEnum funcEnum, String index, SFunction<S, ?> column, String alias) {
+        Class<?> aClass = LambdaUtils.getEntityClass(column);
+        Map<String, SelectCache> cacheMap = ColumnCache.getMapField(aClass);
+        getSelectColum().add(new SelectFunc(cacheMap.get(LambdaUtils.getName(column)), getIndex(), alias, funcEnum, true, index));
+        return getChildren();
+    }
+
     default <S, X> Children selectFunc(BaseFuncEnum funcEnum, SFunction<S, ?> column, SFunction<X, ?> alias) {
         return selectFunc(funcEnum, column, LambdaUtils.getName(alias));
     }
 
+    default <S, X> Children selectFunc(BaseFuncEnum funcEnum, String index, SFunction<S, ?> column, SFunction<X, ?> alias) {
+        return selectFunc(funcEnum, index, column, LambdaUtils.getName(alias));
+    }
+
     default <S> Children selectFunc(BaseFuncEnum funcEnum, SFunction<S, ?> column) {
         return selectFunc(funcEnum, column, column);
     }
 
+    default <S> Children selectFunc(BaseFuncEnum funcEnum, String index, SFunction<S, ?> column) {
+        return selectFunc(funcEnum, index, column, column);
+    }
+
     default <X> Children selectFunc(BaseFuncEnum funcEnum, Object column, SFunction<X, ?> alias) {
         return selectFunc(funcEnum, column, LambdaUtils.getName(alias));
     }
 
 
     default <X> Children selectFunc(String sql, Function<SelectFunc.Func, SFunction<?, ?>[]> column, String alias) {
-        getSelectColum().add(new SelectFunc(alias, getIndex(), () -> sql, column.apply(new SelectFunc.Func()),
+        getSelectColum().add(new SelectFunc(alias, getIndex(), () -> sql, column.apply(SelectFunc.Func.func),
                 isHasAlias(), getAlias()));
         return getChildren();
     }
 
     default <X, S> Children selectFunc(String sql, Function<SelectFunc.Func, SFunction<?, ?>[]> column, SFunction<S, ?> alias) {
         getSelectColum().add(new SelectFunc(LambdaUtils.getName(alias), getIndex(), () -> sql,
-                column.apply(new SelectFunc.Func()), isHasAlias(), getAlias()));
+                column.apply(SelectFunc.Func.func), isHasAlias(), getAlias()));
         return getChildren();
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectFunc.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectFunc.java
index f7dc0e5..8c0bf7d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectFunc.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectFunc.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.wrapper.enums.BaseFuncEnum;
-import lombok.Data;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.apache.ibatis.type.TypeHandler;
 
@@ -71,7 +71,15 @@ public class SelectFunc implements Select {
     public SelectFunc(String alias, Integer index, BaseFuncEnum func, SFunction<?, ?>[] args, boolean hasTableAlias, String tableAlias) {
         this.index = index;
         this.column = null;
-        this.args = Arrays.stream(args).map(i -> new Arg(LambdaUtils.getEntityClass(i), LambdaUtils.getName(i))).toArray(Arg[]::new);
+        this.args = Arrays.stream(args).map(i -> {
+            boolean ins = i instanceof Fun;
+            if (ins) {
+                Fun<?, ?> f = (Fun<?, ?>) i;
+                return new Arg(LambdaUtils.getEntityClass(f.getFunc()), LambdaUtils.getName(f.getFunc()), true, f.getAlias());
+            } else {
+                return new Arg(LambdaUtils.getEntityClass(i), LambdaUtils.getName(i), false, null);
+            }
+        }).toArray(Arg[]::new);
         this.cache = null;
         this.hasAlias = true;
         this.alias = alias;
@@ -149,16 +157,13 @@ public class SelectFunc implements Select {
         return false;
     }
 
-    @Data
+    @Getter
+    @AllArgsConstructor
     public static class Arg {
-        public Class<?> clazz;
-
-        public String prop;
-
-        public Arg(Class<?> clazz, String prop) {
-            this.clazz = clazz;
-            this.prop = prop;
-        }
+        private final Class<?> clazz;
+        private final String prop;
+        private final boolean hasTableAlias;
+        private final String tableAlias;
     }
 
     /**
@@ -168,6 +173,8 @@ public class SelectFunc implements Select {
     @SuppressWarnings("unused")
     public static class Func {
 
+        public static final Func func = new Func();
+
         public final <A> SFunction<?, ?>[] accept(SFunction<A, ?> a) {
             return new SFunction[]{a};
         }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/FuncAliasTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/FuncAliasTest.java
new file mode 100644
index 0000000..32c3725
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/FuncAliasTest.java
@@ -0,0 +1,49 @@
+package com.github.yulichang.test.join.m;
+
+import com.github.yulichang.test.join.entity.AddressDO;
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.join.mapper.UserMapper;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.github.yulichang.wrapper.segments.Fun;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.jdbc.BadSqlGrammarException;
+
+@SpringBootTest
+public class FuncAliasTest {
+    @Autowired
+    private UserMapper userMapper;
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+    @Test
+    void funcAlias() {
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
+                "t.address_id2, t.del, t.create_by, t.update_by, count(ad.id) AS id, count(addr.id) AS id, " +
+                "if(ad.user_id < 5, addr.user_id, ad.user_id + 100) AS id FROM `user` t " +
+                "LEFT JOIN address ad ON (ad.user_id = t.id) LEFT JOIN address addr ON (addr.user_id = t.id) " +
+                "WHERE t.del = false AND ad.del = false AND addr.del = false");
+        MPJLambdaWrapper<UserDO> wrapper = new MPJLambdaWrapper<UserDO>()
+                .selectAll(UserDO.class)
+                .selectFunc(() -> "count(%s)", "ad", AddressDO::getId)
+                .selectFunc(() -> "count(%s)", "addr", AddressDO::getId)
+                .selectFunc("if(%s < 5,%s,%s + 100)", arg -> arg.accept(
+                        Fun.f("ad", AddressDO::getUserId),
+                        Fun.f("addr", AddressDO::getUserId),
+                        Fun.f("ad", AddressDO::getUserId)), UserDO::getId)
+                .leftJoin(AddressDO.class, "ad", AddressDO::getUserId, UserDO::getId)
+                .leftJoin(AddressDO.class, "addr", AddressDO::getUserId, UserDO::getId);
+
+        try {
+            userMapper.selectJoinList(UserDO.class, wrapper);
+        } catch (BadSqlGrammarException ignored) {
+        }
+    }
+}

From db0d197226b9a13d423bb4e1fde2f355bf5c7764 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 19 Jan 2024 22:51:22 +0800
Subject: [PATCH 76/88] =?UTF-8?q?SelectFunc=20=E5=AD=97=E6=AE=B5=E5=88=AB?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/wrapper/segments/Fun.java       | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/Fun.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/Fun.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/Fun.java
new file mode 100644
index 0000000..b398c56
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/Fun.java
@@ -0,0 +1,36 @@
+package com.github.yulichang.wrapper.segments;
+
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 别名func
+ * <p>
+ * 仅对selectFunc有效
+ *
+ * @author yulichang
+ * @since 1.4.11
+ */
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class Fun<T, R> implements SFunction<T, R> {
+
+    private final String alias;
+    private final SFunction<T, R> func;
+
+    @Override
+    public R apply(T t) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * 别名func
+     * <p>
+     * 仅对selectFunc有效
+     */
+    public static <T, R> Fun<T, R> f(String alias, SFunction<T, R> func) {
+        return new Fun<>(alias, func);
+    }
+}

From a0c8d9c7977aa75cb1689d8fe7cdf0a01476c32f Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sat, 20 Jan 2024 15:03:13 +0800
Subject: [PATCH 77/88] fix
 https://gitee.com/best_handsome/mybatis-plus-join/issues/I84S1N
 https://gitee.com/best_handsome/mybatis-plus-join/issues/I7B6DT
 https://github.com/yulichang/mybatis-plus-join/issues/73

---
 .../mapping/mapper/MPJTableFieldInfo.java     | 10 +--
 .../test/mapping/entity/AddressDO.java        | 10 +++
 .../yulichang/test/mapping/entity/AreaDO.java |  8 +-
 .../test/mapping/service/AddressService.java  |  7 ++
 .../service/impl/AddressServiceImpl.java      | 12 +++
 .../src/main/resources/db/data.sql            | 88 +++++++++----------
 .../src/main/resources/db/schema.sql          |  5 +-
 .../yulichang/test/mapping/MappingTest.java   | 11 +++
 8 files changed, 96 insertions(+), 55 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/service/AddressService.java
 create mode 100644 mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/service/impl/AddressServiceImpl.java

diff --git a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java
index 0c630c6..608fda7 100644
--- a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java
+++ b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java
@@ -123,7 +123,7 @@ public class MPJTableFieldInfo {
                 (!Arrays.asList(mapping.select()).contains(this.joinProperty.trim()) &&
                         !Arrays.asList(mapping.select()).contains(this.joinColumn.trim()));
         this.wrapper = new MPJMappingWrapper(mapping.first(), checkArr(mapping.select()) ?
-                (this.isRemoveBindField ? propToColumn(this.joinClass, mapping.select(), this.joinColumn) :
+                (this.isRemoveBindField ? propToColumn(this.joinClass, mapping.select(), this.joinProperty) :
                         propToColumn(this.joinClass, mapping.select(), null)) : null,
                 mapping.apply(), mapping.condition(), mapping.last(), mapping.orderByAsc(), mapping.orderByDesc());
     }
@@ -146,7 +146,7 @@ public class MPJTableFieldInfo {
         this.isRemoveBindField = !mappingField.select().equals(this.joinColumn.trim()) &&
                 !mappingField.select().equals(this.joinProperty.trim());
         this.wrapper = new MPJMappingWrapper(mappingField.first(), this.isRemoveBindField ?
-                propToColumn(this.joinClass, new String[]{mappingField.select()}, this.joinColumn) :
+                propToColumn(this.joinClass, new String[]{mappingField.select()}, this.joinProperty) :
                 propToColumn(this.joinClass, new String[]{mappingField.select()}, null), mappingField.apply(),
                 mappingField.condition(), mappingField.last(), mappingField.orderByAsc(), mappingField.orderByDesc());
         initBindField(mappingField.select());
@@ -201,9 +201,9 @@ public class MPJTableFieldInfo {
             this.joinColumn = joinFieldInfo.getColumn();
             this.joinField = getField(this.joinClass, joinFieldInfo);
         }
-        Assert.notNull(this.joinField, "注解属性thisField不存在 %s , %s", this.joinClass.getName(),
+        Assert.notNull(this.joinField, "注解属性joinField不存在 %s , %s", this.joinClass.getName(),
                 StringUtils.isBlank(this.joinProperty) ? "主键" : this.joinProperty);
-        Assert.notNull(this.joinColumn, "注解属性thisField不存在 %s , %s", this.joinClass.getName(),
+        Assert.notNull(this.joinColumn, "注解属性joinField不存在 %s , %s", this.joinClass.getName(),
                 StringUtils.isBlank(this.joinProperty) ? "主键" : this.joinProperty);
         this.joinField.setAccessible(true);
     }
@@ -268,7 +268,7 @@ public class MPJTableFieldInfo {
     }
 
     private boolean checkArr(String[] arr) {
-        if (Objects.isNull(arr) || arr.length <= 0) {
+        if (Objects.isNull(arr) || arr.length == 0) {
             return false;
         }
         return Arrays.stream(arr).anyMatch(StringUtils::isNotBlank);
diff --git a/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/entity/AddressDO.java b/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/entity/AddressDO.java
index 4bfd471..6d9815e 100644
--- a/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/entity/AddressDO.java
+++ b/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/entity/AddressDO.java
@@ -1,17 +1,21 @@
 package com.github.yulichang.test.mapping.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.yulichang.annotation.FieldMapping;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+import lombok.experimental.FieldNameConstants;
 
 @Data
 @ToString
 @Accessors(chain = true)
 @EqualsAndHashCode
+@FieldNameConstants
 @TableName("address")
 public class AddressDO {
 
@@ -22,10 +26,16 @@ public class AddressDO {
 
     private Integer areaId;
 
+    private String city;
+
     private String tel;
 
     private String address;
 
     @TableLogic
     private Boolean del;
+
+    @TableField(exist = false)
+    @FieldMapping(tag = AreaDO.class, thisField = "city", joinField = "cityId", select = "area")
+    private String area;
 }
diff --git a/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/entity/AreaDO.java b/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/entity/AreaDO.java
index fd1840f..7a3a130 100644
--- a/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/entity/AreaDO.java
+++ b/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/entity/AreaDO.java
@@ -1,26 +1,26 @@
 package com.github.yulichang.test.mapping.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+import lombok.experimental.FieldNameConstants;
 
 @Data
 @ToString
 @Accessors(chain = true)
 @EqualsAndHashCode
+@FieldNameConstants
 @TableName("area")
 public class AreaDO {
 
-    @TableId
-    private Integer id;
+    private Integer areaId;
 
     private String province;
 
-    private String city;
+    private String cityId;
 
     private String area;
 
diff --git a/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/service/AddressService.java b/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/service/AddressService.java
new file mode 100644
index 0000000..dd09ced
--- /dev/null
+++ b/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/service/AddressService.java
@@ -0,0 +1,7 @@
+package com.github.yulichang.test.mapping.service;
+
+import com.github.yulichang.extension.mapping.base.MPJDeepService;
+import com.github.yulichang.test.mapping.entity.AddressDO;
+
+public interface AddressService extends MPJDeepService<AddressDO> {
+}
diff --git a/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/service/impl/AddressServiceImpl.java b/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/service/impl/AddressServiceImpl.java
new file mode 100644
index 0000000..475abdb
--- /dev/null
+++ b/mybatis-plus-join-test/test-mapping/src/main/java/com/github/yulichang/test/mapping/service/impl/AddressServiceImpl.java
@@ -0,0 +1,12 @@
+package com.github.yulichang.test.mapping.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.test.mapping.entity.AddressDO;
+import com.github.yulichang.test.mapping.mapper.AddressMapper;
+import com.github.yulichang.test.mapping.service.AddressService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AddressServiceImpl extends ServiceImpl<AddressMapper, AddressDO> implements AddressService {
+
+}
diff --git a/mybatis-plus-join-test/test-mapping/src/main/resources/db/data.sql b/mybatis-plus-join-test/test-mapping/src/main/resources/db/data.sql
index 7a3045b..b0e1861 100644
--- a/mybatis-plus-join-test/test-mapping/src/main/resources/db/data.sql
+++ b/mybatis-plus-join-test/test-mapping/src/main/resources/db/data.sql
@@ -4,28 +4,28 @@
 
 DELETE FROM area;
 
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10001, '北京市01', '北京01', '朝阳01', '80001', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10002, '北京市02', '北京02', '朝阳02', '80002', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10003, '北京市03', '北京03', '朝阳03', '80003', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10004, '北京市04', '北京04', '朝阳04', '80004', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10005, '北京市05', '北京05', '朝阳05', '80005', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10006, '北京市06', '北京06', '朝阳06', '80006', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10007, '北京市07', '北京07', '朝阳07', '80007', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10008, '北京市08', '北京08', '朝阳08', '80008', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10009, '北京市09', '北京09', '朝阳09', '80009', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10010, '北京市10', '北京10', '朝阳10', '80010', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10011, '北京市11', '北京11', '朝阳11', '80011', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10012, '北京市12', '北京12', '朝阳12', '80012', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10013, '北京市13', '北京13', '朝阳13', '80013', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10014, '北京市14', '北京14', '朝阳14', '80014', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10015, '北京市15', '北京15', '朝阳15', '80015', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10016, '北京市16', '北京16', '朝阳16', '80016', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10017, '北京市17', '北京17', '朝阳17', '80017', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10018, '北京市18', '北京18', '朝阳18', '80018', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10019, '北京市19', '北京19', '朝阳19', '80019', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10020, '北京市20', '北京20', '朝阳20', '80020', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10021, '北京市21', '北京21', '朝阳21', '80021', false);
-INSERT INTO area (id, province, city, area, postcode, del) VALUES (10022, '北京市22', '北京22', '朝阳22', '80022', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10001, '北京市01', '北京01', '朝阳01', '80001', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10002, '北京市02', '北京02', '朝阳02', '80002', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10003, '北京市03', '北京03', '朝阳03', '80003', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10004, '北京市04', '北京04', '朝阳04', '80004', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10005, '北京市05', '北京05', '朝阳05', '80005', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10006, '北京市06', '北京06', '朝阳06', '80006', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10007, '北京市07', '北京07', '朝阳07', '80007', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10008, '北京市08', '北京08', '朝阳08', '80008', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10009, '北京市09', '北京09', '朝阳09', '80009', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10010, '北京市10', '北京10', '朝阳10', '80010', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10011, '北京市11', '北京11', '朝阳11', '80011', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10012, '北京市12', '北京12', '朝阳12', '80012', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10013, '北京市13', '北京13', '朝阳13', '80013', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10014, '北京市14', '北京14', '朝阳14', '80014', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10015, '北京市15', '北京15', '朝阳15', '80015', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10016, '北京市16', '北京16', '朝阳16', '80016', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10017, '北京市17', '北京17', '朝阳17', '80017', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10018, '北京市18', '北京18', '朝阳18', '80018', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10019, '北京市19', '北京19', '朝阳19', '80019', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10020, '北京市20', '北京20', '朝阳20', '80020', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10021, '北京市21', '北京21', '朝阳21', '80021', false);
+INSERT INTO area (area_id, province, city_id, area, postcode, del) VALUES (10022, '北京市22', '北京22', '朝阳22', '80022', false);
 
 DELETE FROM `user`;
 
@@ -55,25 +55,25 @@ INSERT INTO `user` (id, pid, `name`, `address_id`, sex, head_img, del) VALUES (2
 
 DELETE FROM address;
 
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES ( 1, 1, 10001, '10000000001', '曹县01', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES ( 2, 1, 10002, '10000000002', '曹县02', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES ( 3, 1, 10003, '10000000003', '曹县03', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES ( 4, 1, 10004, '10000000004', '曹县04', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES ( 5, 1, 10005, '10000000005', '曹县05', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES ( 6, 1, 10006, '10000000006', '曹县06', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES ( 7, 1, 10007, '10000000007', '曹县07', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES ( 8, 1, 10008, '10000000008', '曹县08', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES ( 9, 1, 10009, '10000000009', '曹县09', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (10,10, 10010, '10000000010', '曹县10', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (11,11, 10011, '10000000011', '曹县11', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (12,12, 10012, '10000000012', '曹县12', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (13,13, 10013, '10000000013', '曹县13', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (14,14, 10014, '10000000014', '曹县14', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (15,15, 10015, '10000000015', '曹县15', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (16,16, 10016, '10000000016', '曹县16', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (17,17, 10017, '10000000017', '曹县17', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (18,18, 10018, '10000000018', '曹县18', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (19,19, 10019, '10000000019', '曹县19', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (20,20, 10020, '10000000020', '曹县20', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (21,21, 10021, '10000000021', '曹县21', false);
-INSERT INTO address (id, user_id, area_id, tel, address, del) VALUES (22,22, 10022, '10000000022', '曹县22', false);
\ No newline at end of file
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES ( 1, 1, 10001, '北京01', '10000000001', '曹县01', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES ( 2, 1, 10002, '北京02', '10000000002', '曹县02', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES ( 3, 1, 10003, '北京03', '10000000003', '曹县03', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES ( 4, 1, 10004, '北京04', '10000000004', '曹县04', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES ( 5, 1, 10005, '北京05', '10000000005', '曹县05', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES ( 6, 1, 10006, '北京06', '10000000006', '曹县06', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES ( 7, 1, 10007, '北京07', '10000000007', '曹县07', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES ( 8, 1, 10008, '北京08', '10000000008', '曹县08', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES ( 9, 1, 10009, '北京09', '10000000009', '曹县09', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (10,10, 10010, '北京10', '10000000010', '曹县10', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (11,11, 10011, '北京11', '10000000011', '曹县11', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (12,12, 10012, '北京12', '10000000012', '曹县12', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (13,13, 10013, '北京13', '10000000013', '曹县13', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (14,14, 10014, '北京14', '10000000014', '曹县14', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (15,15, 10015, '北京15', '10000000015', '曹县15', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (16,16, 10016, '北京16', '10000000016', '曹县16', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (17,17, 10017, '北京17', '10000000017', '曹县17', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (18,18, 10018, '北京18', '10000000018', '曹县18', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (19,19, 10019, '北京19', '10000000019', '曹县19', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (20,20, 10020, '北京20', '10000000020', '曹县20', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (21,21, 10021, '北京21', '10000000021', '曹县21', false);
+INSERT INTO address (id, user_id, area_id, city, tel, address, del) VALUES (22,22, 10022, '北京22', '10000000022', '曹县22', false);
\ No newline at end of file
diff --git a/mybatis-plus-join-test/test-mapping/src/main/resources/db/schema.sql b/mybatis-plus-join-test/test-mapping/src/main/resources/db/schema.sql
index f077cd5..9eb3ef8 100644
--- a/mybatis-plus-join-test/test-mapping/src/main/resources/db/schema.sql
+++ b/mybatis-plus-join-test/test-mapping/src/main/resources/db/schema.sql
@@ -6,10 +6,10 @@ DROP TABLE IF EXISTS area;
 
 create table area
 (
-    id       int auto_increment
+    area_id       int auto_increment
         primary key,
     province varchar(255) null,
-    city     varchar(255) null,
+    city_id     varchar(255) null,
     area     varchar(255) null,
     postcode varchar(255) null,
     del      bit
@@ -37,6 +37,7 @@ create table address
         primary key,
     user_id int null,
     area_id int null,
+    city    varchar(255) null,
     tel     varchar(255) null,
     address varchar(255) null,
     del     bit
diff --git a/mybatis-plus-join-test/test-mapping/src/test/java/com/github/yulichang/test/mapping/MappingTest.java b/mybatis-plus-join-test/test-mapping/src/test/java/com/github/yulichang/test/mapping/MappingTest.java
index b9cc704..596afc2 100644
--- a/mybatis-plus-join-test/test-mapping/src/test/java/com/github/yulichang/test/mapping/MappingTest.java
+++ b/mybatis-plus-join-test/test-mapping/src/test/java/com/github/yulichang/test/mapping/MappingTest.java
@@ -1,8 +1,10 @@
 package com.github.yulichang.test.mapping;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.test.mapping.entity.AddressDO;
 import com.github.yulichang.test.mapping.entity.UserDO;
+import com.github.yulichang.test.mapping.service.AddressService;
 import com.github.yulichang.test.mapping.service.UserService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.junit.jupiter.api.Test;
@@ -20,6 +22,8 @@ class MappingTest {
 
     @Autowired
     private UserService userService;
+    @Autowired
+    private AddressService addressService;
 
     @Test
     public void test() {
@@ -50,4 +54,11 @@ class MappingTest {
         List<UserDO> dos = userService.listDeep(wrapper, conf -> conf.loop(false));
         System.out.println(1);
     }
+
+    @Test
+    public void testJoin1() {
+        List<AddressDO> dos = addressService.listDeep(Wrappers.emptyWrapper());
+        assert dos.get(0).getArea() != null;
+        dos.forEach(System.out::println);
+    }
 }

From 750b216156313223c117f46b7e5ca15f00528578 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Tue, 30 Jan 2024 20:50:45 +0800
Subject: [PATCH 78/88] fix
 https://github.com/yulichang/mybatis-plus-join/issues/110

---
 .../github/yulichang/annotation/EntityMapping.java  |  2 +-
 .../github/yulichang/annotation/FieldMapping.java   |  4 ++--
 .../MybatisPlusJoinAutoConfiguration.java           |  5 ++---
 .../yulichang/toolkit/SpringContentUtils.java       | 13 ++++++-------
 .../mybatisplusjoin/solon/plugin/XPluginImpl.java   |  4 ++--
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java
index 74e30ef..5af8df4 100644
--- a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java
+++ b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/EntityMapping.java
@@ -12,7 +12,7 @@ import java.lang.annotation.*;
 @Documented
 @SuppressWarnings("unused")
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target(ElementType.FIELD)
 public @interface EntityMapping {
 
     /**
diff --git a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/FieldMapping.java b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/FieldMapping.java
index 3ae7f4e..2ecf851 100644
--- a/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/FieldMapping.java
+++ b/mybatis-plus-join-annotation/src/main/java/com/github/yulichang/annotation/FieldMapping.java
@@ -10,9 +10,9 @@ import java.lang.annotation.*;
  * @since 1.2.0
  */
 @Documented
-@SuppressWarnings({"unused"})
+@SuppressWarnings("unused")
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Target(ElementType.FIELD)
 public @interface FieldMapping {
 
     /**
diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
index 37a17c1..fc68082 100644
--- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
+++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java
@@ -40,7 +40,6 @@ import org.springframework.core.annotation.Order;
 
 import javax.sql.DataSource;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.function.BiPredicate;
 
@@ -155,8 +154,8 @@ public class MybatisPlusJoinAutoConfiguration {
         }
 
         @Override
-        public <T> Map<String, T> getBeansOfType(Class<T> clazz) {
-            return getBeanFactory().getBeansOfType(clazz);
+        public <T> void getBeansOfType(Class<T> clazz) {
+            getBeanFactory().getBeansOfType(clazz);
         }
 
         private ListableBeanFactory getBeanFactory() {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SpringContentUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SpringContentUtils.java
index 5cbd1f2..8f42e60 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SpringContentUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SpringContentUtils.java
@@ -8,8 +8,8 @@ import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.ibatis.session.SqlSession;
 
-import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 /**
  * spring容器工具类
@@ -29,15 +29,14 @@ public class SpringContentUtils {
     }
 
     public static <T> T getBean(Class<T> clazz) {
-        return SpringContentUtils.springContext.getBean(clazz);
+        return Optional.ofNullable(springContext).map(c -> c.getBean(clazz)).orElse(null);
     }
 
-    @SuppressWarnings("UnusedReturnValue")
-    public static <T> Map<String, T> getBeansOfType(Class<T> clazz) {
-        return SpringContentUtils.springContext.getBeansOfType(clazz);
+    public static <T> void getBeansOfType(Class<T> clazz) {
+        Optional.ofNullable(springContext).ifPresent(c -> c.getBeansOfType(clazz));
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "deprecation"})
     public static <T> T getMapper(Class<?> clazz) {
         if (Objects.isNull(springContext)) {
             SqlSession session = SqlHelper.sqlSession(clazz);
@@ -57,6 +56,6 @@ public class SpringContentUtils {
 
         <T> T getBean(Class<T> clazz);
 
-        <T> Map<String, T> getBeansOfType(Class<T> clazz);
+        <T> void getBeansOfType(Class<T> clazz);
     }
 }
diff --git a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
index fac0584..38b46a4 100644
--- a/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
+++ b/mybatis-plus-join-solon-plugin/src/main/java/com/github/yulichang/mybatisplusjoin/solon/plugin/XPluginImpl.java
@@ -44,8 +44,8 @@ public class XPluginImpl implements Plugin {
             }
 
             @Override
-            public <T> Map<String, T> getBeansOfType(Class<T> clazz) {
-                return context.getBeansMapOfType(clazz);
+            public <T> void getBeansOfType(Class<T> clazz) {
+                context.getBeansMapOfType(clazz);
             }
         });
         // 读取配置

From 44a726ace84d0d1278f041ffc2374d1540469384 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Fri, 1 Mar 2024 17:12:40 +0800
Subject: [PATCH 79/88] =?UTF-8?q?=E6=B7=BB=E5=8A=A0around?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../github/yulichang/kt/KtAbstractWrapper.java | 11 +++++++++--
 .../yulichang/wrapper/JoinAbstractWrapper.java | 11 +++++++++--
 .../yulichang/wrapper/MPJLambdaWrapper.java    | 12 ++++++++++++
 .../yulichang/wrapper/interfaces/Join.java     | 18 ++++++++++++++++++
 4 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
index b3b6c45..8108791 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
@@ -313,7 +313,7 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     @Override
     public Children last(boolean condition, String lastSql) {
         if (condition) {
-            this.lastSql.setStringValue(StringPool.SPACE + lastSql);
+            this.lastSql.setStringValue(this.lastSql.getStringValue() + StringPool.SPACE + lastSql);
         }
         return typedThis;
     }
@@ -329,11 +329,18 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
     @Override
     public Children first(boolean condition, String firstSql) {
         if (condition) {
-            this.sqlFirst.setStringValue(firstSql);
+            this.sqlFirst.setStringValue(firstSql + StringPool.SPACE + this.sqlFirst.getStringValue());
         }
         return typedThis;
     }
 
+    @Override
+    public Children around(boolean condition, String firstSql, String lastSql) {
+        this.first(condition, firstSql);
+        this.last(condition, lastSql);
+        return typedThis;
+    }
+
     @Override
     public Children exists(boolean condition, String existsSql, Object... values) {
         return maybeDo(condition, () -> appendSqlSegments(EXISTS,
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 e0f34de..23f0ac2 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
@@ -333,7 +333,7 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
     @Override
     public Children last(boolean condition, String lastSql) {
         if (condition) {
-            this.lastSql.setStringValue(StringPool.SPACE + lastSql);
+            this.lastSql.setStringValue(this.lastSql.getStringValue() + StringPool.SPACE + lastSql);
         }
         return typedThis;
     }
@@ -349,11 +349,18 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
     @Override
     public Children first(boolean condition, String firstSql) {
         if (condition) {
-            this.sqlFirst.setStringValue(firstSql);
+            this.sqlFirst.setStringValue(firstSql + StringPool.SPACE + this.sqlFirst.getStringValue());
         }
         return typedThis;
     }
 
+    @Override
+    public Children around(boolean condition, String firstSql, String lastSql) {
+        this.first(condition, firstSql);
+        this.last(condition, lastSql);
+        return typedThis;
+    }
+
     @Override
     public Children exists(boolean condition, String existsSql, Object... values) {
         return maybeDo(condition, () -> appendSqlSegments(EXISTS,
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index c043b1e..adcd716 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -197,6 +197,18 @@ public class MPJLambdaWrapper<T> extends JoinAbstractLambdaWrapper<T, MPJLambdaW
         return Query.super.selectAll(clazz);
     }
 
+    /**
+     * 查询主表全部字段
+     * <p>
+     * 需要使用 使用 JoinWrappers.lambda(clazz) 或者 new MPJLambdaQueryWrapper&lt;&lt;(clazz) 构造
+     *
+     * @return children
+     */
+    public MPJLambdaWrapper<T> selectAll() {
+        Assert.notNull(getEntityClass(), "使用 JoinWrappers.lambda(clazz) 或者 new MPJLambdaQueryWrapper<>(clazz)");
+        return selectAll(getEntityClass());
+    }
+
     /**
      * 子查询
      */
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Join.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Join.java
index b77bbe0..3ee3a88 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Join.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Join.java
@@ -97,6 +97,24 @@ public interface Join<Children> extends Serializable {
      */
     Children first(boolean condition, String firstSql);
 
+    /**
+     * ignore
+     */
+    default Children around(String firstSql, String lastSql) {
+        return around(true, firstSql, lastSql);
+    }
+
+    /**
+     * sql 起始句 和介绍语句（会拼接在SQL语句的起始处和结束处）
+     *
+     * @param condition 执行条件
+     * @param firstSql  起始语句
+     * @param lastSql   结束语句
+     * @return children
+     * @since 1.4.11
+     */
+    Children around(boolean condition, String firstSql, String lastSql);
+
     /**
      * ignore
      */

From 75f497fd293545da2cf9400b9944fcf452d7e2c7 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sat, 2 Mar 2024 23:34:21 +0800
Subject: [PATCH 80/88] =?UTF-8?q?=E6=B7=BB=E5=8A=A0around?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/test/join/m/AroundTest.java     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/AroundTest.java

diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/AroundTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/AroundTest.java
new file mode 100644
index 0000000..32ac2f8
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/AroundTest.java
@@ -0,0 +1,30 @@
+package com.github.yulichang.test.join.m;
+
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class AroundTest {
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+
+    @Test
+    void around() {
+        ThreadLocalUtils.set("SELECT * FROM (SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, " +
+                "t.create_time, t.address_id, t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false) tmp");
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda(UserDO.class)
+                .around("select * from (", ") tmp");
+        wrapper.list().forEach(System.out::println);
+    }
+
+}

From 86d94a02640c01891e25b8586181819bd15df1a4 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sat, 2 Mar 2024 23:59:54 +0800
Subject: [PATCH 81/88] 1.4.11

---
 README-zh.md                                                | 4 ++--
 README.md                                                   | 6 ++++--
 .../com/github/yulichang/config/MPJInterceptorConfig.java   | 2 +-
 mybatis-plus-join-test/pom.xml                              | 2 +-
 mybatis-plus-join-test/test-springboot3-jdk17/pom.xml       | 2 +-
 mybatis-plus-join/pom.xml                                   | 2 +-
 pom.xml                                                     | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index 2e0e25d..81272a5 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -47,12 +47,12 @@ QQ群:680016987  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.10</version>
+      <version>1.4.11</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.10'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.11'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/README.md b/README.md
index c32c63f..f866290 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,8 @@
 <p align="center">
 QQ群:680016987  或者 
 <a href="https://gitee.com/best_handsome/mybatis-plus-join/issues/I65N2M" target="_blank">添加作者微信，备注MPJ，加入微信群</a>
+<br/>
+<img width="200px" height="200px" src="https://mybatisplusjoin.com/qr.png"  alt="添加作者微信，备注MPJ，加入微信群"/>
 </p>
 
 ### <a href="https://www.baidu.com/link?url=6NtKqbGKUIIdwoBUaqNkQnLiG3d5y03L6Pfg6ODId0VKfPifpB1xqdQzsBprm-0h&wd=&eqid=d26e7f1600004777000000056440ade6" target="_blank">使用文档WIKI</a>
@@ -45,12 +47,12 @@ QQ群:680016987  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.10</version>
+      <version>1.4.11</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.10'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.11'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
index b0b2425..9816dd2 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
@@ -30,7 +30,7 @@ public class MPJInterceptorConfig {
             System.out.println(" _ _   |_  _ _|_. ___ _ |    _  .  _  .  _  \n" +
                     "| | |\\/|_)(_| | |_\\  |_)||_|_\\  | (_) | | | \n" +
                     "     /               |          /\n" +
-                    "                                    1.4.10");
+                    "                                    1.4.11");
         }
     }
 
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index 9c3ac12..ed19eb7 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -50,7 +50,7 @@
     </scm>
 
     <properties>
-        <revision>1.4.10</revision>
+        <revision>1.4.11</revision>
         <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>
diff --git a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
index 65bf793..f76fbe8 100644
--- a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
+++ b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
@@ -14,7 +14,7 @@
     <artifactId>test-springboot3-jdk17</artifactId>
 
     <properties>
-        <revision>1.4.10</revision>
+        <revision>1.4.11</revision>
         <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
 
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/mybatis-plus-join/pom.xml b/mybatis-plus-join/pom.xml
index 188c731..65fd821 100644
--- a/mybatis-plus-join/pom.xml
+++ b/mybatis-plus-join/pom.xml
@@ -41,7 +41,7 @@
     </scm>
 
     <properties>
-        <revision>1.4.10</revision>
+        <revision>1.4.11</revision>
 
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>
diff --git a/pom.xml b/pom.xml
index bf0625a..882de63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
     </modules>
 
     <properties>
-        <revision>1.4.10</revision>
+        <revision>1.4.11</revision>
         <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>

From 5c57a0aa6e39d4ff8e3fb13a3b202df631e217bd Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 20 Mar 2024 17:37:28 +0800
Subject: [PATCH 82/88] 
 https://github.com/yulichang/mybatis-plus-join/issues/120

---
 .../yulichang/method/MPJBaseMethod.java       |  4 +--
 .../github/yulichang/toolkit/SqlHelper.java   | 14 +++-------
 .../yulichang/wrapper/interfaces/Chain.java   | 27 +++++++------------
 .../yulichang/test/join/m/TableAliasTest.java | 10 +++++++
 pom.xml                                       |  7 +++--
 5 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java
index c3c475e..8967940 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java
@@ -107,7 +107,7 @@ public interface MPJBaseMethod extends Constants {
             return filedSqlScript;
         }
         String newKeyProperty = newPrefix + tableInfo.getKeyProperty();
-        String keySqlScript = ConfigProperties.tableAlias + DOT + tableInfo.getKeyColumn() + EQUALS +
+        String keySqlScript = "${ew.alias}" + DOT + tableInfo.getKeyColumn() + EQUALS +
                 SqlScriptUtils.safeParam(newKeyProperty);
         return SqlScriptUtils.convertIf(keySqlScript, String.format("%s != null", newKeyProperty), false)
                 + NEWLINE + filedSqlScript;
@@ -116,7 +116,7 @@ public interface MPJBaseMethod extends Constants {
     default String getSqlWhere(TableFieldInfo tableFieldInfo, final String prefix) {
         final String newPrefix = prefix == null ? EMPTY : prefix;
         // 默认:  AND column=#{prefix + el}
-        String sqlScript = " AND " + String.format(tableFieldInfo.getCondition(), ConfigProperties.tableAlias + DOT +
+        String sqlScript = " AND " + String.format(tableFieldInfo.getCondition(), "${ew.alias}" + DOT +
                 tableFieldInfo.getColumn(), newPrefix + tableFieldInfo.getEl());
         // 查询的时候只判非空
         return convertIf(tableFieldInfo, sqlScript, convertIfProperty(newPrefix, tableFieldInfo.getProperty()),
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SqlHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SqlHelper.java
index 8ddfc3e..1063c25 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SqlHelper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/SqlHelper.java
@@ -1,6 +1,5 @@
 package com.github.yulichang.toolkit;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.github.yulichang.base.MPJBaseMapper;
 
@@ -12,17 +11,10 @@ import java.util.function.Function;
  * @since 1.4.4
  */
 @SuppressWarnings("unchecked")
-public class SqlHelper {
+public final class SqlHelper {
 
-    public static <R, T> R exec(Class<T> entityClass, Function<BaseMapper<T>, R> function) {
-        Assert.notNull(entityClass,"请使用 new MPJLambdaWrapper(主表.class) 或 JoinWrappers.lambda(主表.class) 构造方法");
-        Object mapper = SpringContentUtils.getMapper(entityClass);
-        Assert.notNull(mapper, "mapper not init <%s>", entityClass.getSimpleName());
-        return function.apply((BaseMapper<T>) mapper);
-    }
-
-    public static <R, T> R execJoin(Class<T> entityClass, Function<MPJBaseMapper<T>, R> function) {
-        Assert.notNull(entityClass,"请使用 new MPJLambdaWrapper(主表.class) 或 JoinWrappers.lambda(主表.class) 构造方法");
+    public static <R, T> R exec(Class<T> entityClass, Function<MPJBaseMapper<T>, R> function) {
+        Assert.notNull(entityClass, "请使用 new MPJLambdaWrapper(主表.class) 或 JoinWrappers.lambda(主表.class) 构造方法");
         Object mapper = SpringContentUtils.getMapper(entityClass);
         Assert.notNull(mapper, "mapper not init <%s>", entityClass.getSimpleName());
         Assert.isTrue(mapper instanceof MPJBaseMapper, "mapper <%s> not extends MPJBaseMapper ", entityClass.getSimpleName());
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Chain.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Chain.java
index 5c15dc4..0c83bcd 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Chain.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Chain.java
@@ -1,10 +1,6 @@
 package com.github.yulichang.wrapper.interfaces;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.github.yulichang.base.MPJBaseMapper;
 import com.github.yulichang.interfaces.MPJBaseJoin;
 import com.github.yulichang.toolkit.SqlHelper;
 
@@ -33,10 +29,7 @@ public interface Chain<T> {
      * JoinWrappers.lambda(User.class)<br />
      */
     default Long count() {
-        return SqlHelper.exec(getEntityClass(), mapper -> {
-            Assert.isTrue(mapper instanceof MPJBaseMapper, "mapper <%s> is not extends MPJBaseMapper", mapper.getClass().getSimpleName());
-            return ((MPJBaseMapper<T>) mapper).selectJoinCount((MPJBaseJoin<T>) this);
-        });
+        return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectJoinCount((MPJBaseJoin<T>) this));
     }
 
     /**
@@ -47,7 +40,7 @@ public interface Chain<T> {
      * JoinWrappers.lambda(User.class)<br />
      */
     default T one() {
-        return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectOne((Wrapper<T>) this));
+        return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectJoinOne(getEntityClass(), (MPJBaseJoin<T>) this));
     }
 
     /**
@@ -58,7 +51,7 @@ public interface Chain<T> {
      * JoinWrappers.lambda(User.class)<br />
      */
     default <R> R one(Class<R> resultType) {
-        return SqlHelper.execJoin(getEntityClass(), mapper -> mapper.selectJoinOne(resultType, (MPJBaseJoin<T>) this));
+        return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectJoinOne(resultType, (MPJBaseJoin<T>) this));
     }
 
     /**
@@ -69,8 +62,7 @@ public interface Chain<T> {
      * JoinWrappers.lambda(User.class)<br />
      */
     default T first() {
-        List<T> list = list();
-        return CollectionUtils.isEmpty(list) ? null : list.get(0);
+        return list().stream().findFirst().orElse(null);
     }
 
     /**
@@ -81,8 +73,7 @@ public interface Chain<T> {
      * JoinWrappers.lambda(User.class)<br />
      */
     default <R> R first(Class<R> resultType) {
-        List<R> list = list(resultType);
-        return CollectionUtils.isEmpty(list) ? null : list.get(0);
+        return list(resultType).stream().findFirst().orElse(null);
     }
 
     /**
@@ -92,7 +83,7 @@ public interface Chain<T> {
      * JoinWrappers.lambda(User.class)<br />
      */
     default List<T> list() {
-        return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectList((Wrapper<T>) this));
+        return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectJoinList(getEntityClass(), (MPJBaseJoin<T>) this));
     }
 
     /**
@@ -102,7 +93,7 @@ public interface Chain<T> {
      * JoinWrappers.lambda(User.class)<br />
      */
     default <R> List<R> list(Class<R> resultType) {
-        return SqlHelper.execJoin(getEntityClass(), mapper -> mapper.selectJoinList(resultType, (MPJBaseJoin<T>) this));
+        return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectJoinList(resultType, (MPJBaseJoin<T>) this));
     }
 
     /**
@@ -112,7 +103,7 @@ public interface Chain<T> {
      * JoinWrappers.lambda(User.class)<br />
      */
     default <P extends IPage<T>> P page(P page) {
-        return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectPage(page, (Wrapper<T>) this));
+        return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectJoinPage(page, getEntityClass(), (MPJBaseJoin<T>) this));
     }
 
     /**
@@ -122,6 +113,6 @@ public interface Chain<T> {
      * JoinWrappers.lambda(User.class)<br />
      */
     default <R, P extends IPage<R>> P page(P page, Class<R> resultType) {
-        return SqlHelper.execJoin(getEntityClass(), mapper -> mapper.selectJoinPage(page, resultType, (MPJBaseJoin<T>) this));
+        return SqlHelper.exec(getEntityClass(), mapper -> mapper.selectJoinPage(page, resultType, (MPJBaseJoin<T>) this));
     }
 }
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/TableAliasTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/TableAliasTest.java
index d1fb385..56573b1 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/TableAliasTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/TableAliasTest.java
@@ -84,4 +84,14 @@ public class TableAliasTest {
         List<UserDO> dos = userMapper.selectJoinList(UserDO.class, wrapper);
         dos.forEach(System.out::println);
     }
+
+    @Test
+    void tableAlias3() {
+        ThreadLocalUtils.set("SELECT aaa.id, aaa.pid, aaa.`name`, aaa.`json`, aaa.sex, aaa.head_img, aaa.create_time, " +
+                "aaa.address_id, aaa.address_id2, aaa.del, aaa.create_by, aaa.update_by FROM `user` aaa WHERE aaa.`name` = ? AND aaa.del = false");
+        UserDO userDO = new UserDO();
+        userDO.setName("aaa");
+        MPJLambdaWrapper<UserDO> wrapper = JoinWrappers.lambda("aaa", userDO);
+        wrapper.list();
+    }
 }
diff --git a/pom.xml b/pom.xml
index 882de63..cb2c761 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,20 +62,20 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-aop</artifactId>
-                <version>5.3.30</version>
+                <version>5.3.32</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-stdlib-jdk8</artifactId>
-                <version>1.9.0</version>
+                <version>1.9.22</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-configuration-processor</artifactId>
                 <optional>true</optional>
-                <version>2.7.17</version>
+                <version>2.7.18</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -87,7 +87,6 @@
                 <artifactId>flatten-maven-plugin</artifactId>
                 <version>1.5.0</version>
                 <configuration>
-                    <!-- 是否更新pom文件，此处还有更高级的用法 -->
                     <updatePomFile>true</updatePomFile>
                     <flattenMode>resolveCiFriendliesOnly</flattenMode>
                 </configuration>

From 152cd6c11ca7ded7e541bde918ce6bce96dffe24 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Tue, 9 Apr 2024 06:47:02 +0800
Subject: [PATCH 83/88] fix
 [115](https://github.com/yulichang/mybatis-plus-join/issues/115)

---
 .../java/com/github/yulichang/toolkit/KtWrapperUtils.java     | 4 ++--
 .../main/java/com/github/yulichang/toolkit/WrapperUtils.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
index d980af0..ca2482d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
@@ -42,7 +42,7 @@ public class KtWrapperUtils {
         return String.format(" (%s SELECT %s FROM %s %s %s %s %s %s %s) AS %s ",
                 first,
                 wrapper.getSqlSelect(),
-                tableInfo.getTableName(),
+                wrapper.getTableName(tableInfo.getTableName()),
                 wrapper.getAlias(),
                 wrapper.getFrom(),
                 mainLogic,
@@ -75,7 +75,7 @@ public class KtWrapperUtils {
         return String.format(" %s SELECT %s FROM %s %s %s %s %s %s %s ",
                 first,
                 wrapper.getSqlSelect(),
-                tableInfo.getTableName(),
+                wrapper.getTableName(tableInfo.getTableName()),
                 wrapper.getAlias(),
                 wrapper.getFrom(),
                 mainLogic,
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java
index 910f0f2..615a1cd 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java
@@ -42,7 +42,7 @@ public class WrapperUtils {
         return String.format(" (%s SELECT %s FROM %s %s %s %s %s %s %s) AS %s ",
                 first,
                 wrapper.getSqlSelect(),
-                tableInfo.getTableName(),
+                wrapper.getTableName(tableInfo.getTableName()),
                 wrapper.getAlias(),
                 wrapper.getFrom(),
                 mainLogic,
@@ -75,7 +75,7 @@ public class WrapperUtils {
         return String.format(" %s SELECT %s FROM %s %s %s %s %s %s %s ",
                 first,
                 wrapper.getSqlSelect(),
-                tableInfo.getTableName(),
+                wrapper.getTableName(tableInfo.getTableName()),
                 wrapper.getAlias(),
                 wrapper.getFrom(),
                 mainLogic,

From cd68b2e25d4288a02fc89c203cdbe0ba5e0b8547 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Tue, 9 Apr 2024 06:47:12 +0800
Subject: [PATCH 84/88] fix
 [115](https://github.com/yulichang/mybatis-plus-join/issues/115)

---
 .../github/yulichang/test/join/m/SelectSubTest.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/SelectSubTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/SelectSubTest.java
index 6eaef3e..2563629 100644
--- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/SelectSubTest.java
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/SelectSubTest.java
@@ -48,4 +48,17 @@ public class SelectSubTest {
                 .le(UserDO::getId, 100);
         wrapper1.list();
     }
+
+    @Test
+    void sub1() {
+        ThreadLocalUtils.set("SELECT (SELECT st.id FROM `area` st WHERE st.del = false AND (st.id = t1.id) LIMIT 1) AS id FROM `user` t LEFT JOIN address t1 ON (t1.user_id = t.id) WHERE t.del = false AND t1.del = false AND (t.id <= ?)");
+        MPJLambdaWrapper<UserDO> wrapper1 = JoinWrappers.lambda(UserDO.class)
+                .selectSub(AreaDO.class, w -> w.select(AreaDO::getId)
+                        .eq(AreaDO::getId, AddressDO::getId)
+                        .setTableName(t -> "`" + t + "`")
+                        .last("limit 1"), UserDO::getId)
+                .leftJoin(AddressDO.class, AddressDO::getUserId, UserDO::getId)
+                .le(UserDO::getId, 100);
+        wrapper1.list();
+    }
 }

From 7eb5605fffaebbd5b18230c4a905196132062400 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 10 Apr 2024 09:38:18 +0800
Subject: [PATCH 85/88] =?UTF-8?q?mp=20->=203.5.6=20&=20=E9=80=82=E9=85=8Dj?=
 =?UTF-8?q?sqlparser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pom.xml                                   | 55 +++++++++++++++++
 .../jsqlparser/v46/JSqlParserHelperV46.java   | 59 +++++++++++++++++++
 .../pom.xml                                   | 56 ++++++++++++++++++
 .../adapter/jsqlparser/JSqlParserHelper.java  | 54 +++++++++++++++++
 .../mybatis-plus-join-adapter-base/pom.xml    | 11 +++-
 .../{ITableInfoAdapter.java => IAdapter.java} |  5 +-
 ...eInfoAdapterV33x.java => AdapterV33x.java} | 13 +++-
 ...eInfoAdapter3431.java => Adapter3431.java} | 13 +++-
 .../mybatis-plus-join-adapter-v355/pom.xml    | 59 +++++++++++++++++++
 .../yulichang/adapter/v355/Adapter355.java    | 18 ++++++
 mybatis-plus-join-adapter/pom.xml             | 10 ++++
 mybatis-plus-join-core/pom.xml                |  5 ++
 .../com/github/yulichang/adapter/Adapter.java | 18 ++++++
 .../yulichang/adapter/AdapterHelper.java      | 27 +++++----
 .../yulichang/adapter/TableInfoAdapter.java   | 11 ----
 .../yulichang/config/ConfigProperties.java    |  4 +-
 .../yulichang/interceptor/MPJInterceptor.java | 11 ++--
 .../yulichang/kt/KtDeleteJoinWrapper.java     |  8 +--
 .../yulichang/kt/KtUpdateJoinWrapper.java     |  4 +-
 .../github/yulichang/kt/interfaces/Query.java |  5 +-
 .../github/yulichang/method/DeleteJoin.java   |  2 +-
 .../yulichang/method/MPJBaseMethod.java       |  4 +-
 .../github/yulichang/method/UpdateJoin.java   |  2 +-
 .../yulichang/toolkit/JSqlParserHelper.java   | 55 -----------------
 .../yulichang/toolkit/KtWrapperUtils.java     |  2 +-
 .../yulichang/toolkit/WrapperUtils.java       |  2 +-
 .../yulichang/wrapper/DeleteJoinWrapper.java  |  8 +--
 .../yulichang/wrapper/UpdateJoinWrapper.java  |  4 +-
 .../yulichang/wrapper/interfaces/Query.java   |  5 +-
 .../mapping/mapper/MPJTableFieldInfo.java     |  6 +-
 mybatis-plus-join-test/pom.xml                |  4 +-
 .../test-springboot3-jdk17/pom.xml            |  2 +-
 pom.xml                                       |  2 +-
 33 files changed, 422 insertions(+), 122 deletions(-)
 create mode 100644 mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46/pom.xml
 create mode 100644 mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46/src/main/java/com/github/yulichang/adapter/jsqlparser/v46/JSqlParserHelperV46.java
 create mode 100644 mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser/pom.xml
 create mode 100644 mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser/src/main/java/com/github/yulichang/adapter/jsqlparser/JSqlParserHelper.java
 rename mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/{ITableInfoAdapter.java => IAdapter.java} (89%)
 rename mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/{TableInfoAdapterV33x.java => AdapterV33x.java} (79%)
 rename mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/{TableInfoAdapter3431.java => Adapter3431.java} (62%)
 create mode 100644 mybatis-plus-join-adapter/mybatis-plus-join-adapter-v355/pom.xml
 create mode 100644 mybatis-plus-join-adapter/mybatis-plus-join-adapter-v355/src/main/java/com/github/yulichang/adapter/v355/Adapter355.java
 create mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/Adapter.java
 delete mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/TableInfoAdapter.java
 delete mode 100644 mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JSqlParserHelper.java

diff --git a/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46/pom.xml b/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46/pom.xml
new file mode 100644
index 0000000..a2797c8
--- /dev/null
+++ b/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.yulichang</groupId>
+        <artifactId>mybatis-plus-join-adapter</artifactId>
+        <version>${revision}</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>mybatis-plus-join-adapter-jsqlparser-v46</artifactId>
+    <version>${revision}</version>
+    <name>mybatis-plus-join-adapter-jsqlparser-v46</name>
+
+    <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
+    <url>https://github.com/yulichang/mybatis-plus-join</url>
+    <licenses>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <id>mybatis-plus-join</id>
+            <name>yulichang</name>
+            <email>yu_lichang@qq.com</email>
+        </developer>
+    </developers>
+    <scm>
+        <connection>scm:git:https://github.com/yulichang/mybatis-plus-join.git</connection>
+        <developerConnection>scm:git:https://github.com/yulichang/mybatis-plus-join.git</developerConnection>
+        <url>https://github.com/yulichang/mybatis-plus-join</url>
+    </scm>
+
+    <properties>
+        <jdkVersion>1.8</jdkVersion>
+        <jdkVersion.test>1.8</jdkVersion.test>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <github.global.server>github</github.global.server>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
+            <version>3.5.5</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46/src/main/java/com/github/yulichang/adapter/jsqlparser/v46/JSqlParserHelperV46.java b/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46/src/main/java/com/github/yulichang/adapter/jsqlparser/v46/JSqlParserHelperV46.java
new file mode 100644
index 0000000..a3e44c2
--- /dev/null
+++ b/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46/src/main/java/com/github/yulichang/adapter/jsqlparser/v46/JSqlParserHelperV46.java
@@ -0,0 +1,59 @@
+package com.github.yulichang.adapter.jsqlparser.v46;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.select.*;
+
+import java.util.function.Consumer;
+
+/**
+ * 字段解析
+ *
+ * @author yulichang
+ * @since 1.4.12
+ */
+public class JSqlParserHelperV46 {
+
+    public static void parserColum(String alias, String from, String selectSql, Consumer<String> columConsumer) {
+        try {
+            boolean parser = false;
+            Statement statement = CCJSqlParserUtil.parse(String.format("SELECT %s FROM table %s %s", selectSql, alias, from));
+            if (statement instanceof Select) {
+                Select select = (Select) statement;
+                SelectBody selectBody = select.getSelectBody();
+                if (selectBody instanceof PlainSelect) {
+                    PlainSelect plainSelect = (PlainSelect) selectBody;
+                    if (CollectionUtils.isNotEmpty(plainSelect.getSelectItems())) {
+                        for (SelectItem item : plainSelect.getSelectItems()) {
+                            if (item instanceof SelectExpressionItem) {
+                                String col;
+                                SelectExpressionItem selectExpressionItem = (SelectExpressionItem) item;
+                                if (null == selectExpressionItem.getAlias()) {
+                                    if (selectExpressionItem.getExpression() instanceof Column) {
+                                        col = ((Column) selectExpressionItem.getExpression()).getColumnName();
+                                    } else {
+                                        col = selectExpressionItem.getExpression().toString();
+                                    }
+                                } else {
+                                    col = selectExpressionItem.getAlias().getName();
+                                }
+                                if (StringUtils.isNotBlank(col)) {
+                                    columConsumer.accept(StringUtils.getTargetColumn(col));
+                                }
+                            }
+                        }
+                        parser = true;
+                    }
+                }
+                if (!parser)
+                    throw ExceptionUtils.mpe("JSqlParser parser error <%s>", selectSql);
+            }
+        } catch (Throwable throwable) {
+            throw new RuntimeException(throwable);
+        }
+    }
+}
diff --git a/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser/pom.xml b/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser/pom.xml
new file mode 100644
index 0000000..94ab7fc
--- /dev/null
+++ b/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.yulichang</groupId>
+        <artifactId>mybatis-plus-join-adapter</artifactId>
+        <version>${revision}</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>mybatis-plus-join-adapter-jsqlparser</artifactId>
+    <version>${revision}</version>
+    <name>mybatis-plus-join-adapter-jsqlparser</name>
+
+    <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
+    <url>https://github.com/yulichang/mybatis-plus-join</url>
+    <licenses>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <id>mybatis-plus-join</id>
+            <name>yulichang</name>
+            <email>yu_lichang@qq.com</email>
+        </developer>
+    </developers>
+    <scm>
+        <connection>scm:git:https://github.com/yulichang/mybatis-plus-join.git</connection>
+        <developerConnection>scm:git:https://github.com/yulichang/mybatis-plus-join.git</developerConnection>
+        <url>https://github.com/yulichang/mybatis-plus-join</url>
+    </scm>
+
+    <properties>
+        <jdkVersion>1.8</jdkVersion>
+        <jdkVersion.test>1.8</jdkVersion.test>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <github.global.server>github</github.global.server>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
+            <version>${mpj.mybatis.plus.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser/src/main/java/com/github/yulichang/adapter/jsqlparser/JSqlParserHelper.java b/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser/src/main/java/com/github/yulichang/adapter/jsqlparser/JSqlParserHelper.java
new file mode 100644
index 0000000..87de75d
--- /dev/null
+++ b/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser/src/main/java/com/github/yulichang/adapter/jsqlparser/JSqlParserHelper.java
@@ -0,0 +1,54 @@
+package com.github.yulichang.adapter.jsqlparser;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.SelectItem;
+
+import java.util.function.Consumer;
+
+/**
+ * 字段解析
+ *
+ * @author yulichang
+ * @since 1.4.12
+ */
+public class JSqlParserHelper {
+
+    public static void parserColum(String alias, String from, String selectSql, Consumer<String> columConsumer) {
+        try {
+            boolean parser = false;
+            Statement statement = CCJSqlParserUtil.parse(String.format("SELECT %s FROM table %s %s", selectSql, alias, from));
+            if (statement instanceof PlainSelect) {
+                PlainSelect plainSelect = (PlainSelect) statement;
+                if (CollectionUtils.isNotEmpty(plainSelect.getSelectItems())) {
+                    for (SelectItem<?> item : plainSelect.getSelectItems()) {
+                        String col;
+                        if (item.getAlias() == null) {
+                            if (item.getExpression() instanceof Column) {
+                                Column column = (Column) item.getExpression();
+                                col = column.getColumnName();
+                            } else {
+                                col = item.getExpression().toString();
+                            }
+                        } else {
+                            col = item.getAlias().getName();
+                        }
+                        if (StringUtils.isNotBlank(col)) {
+                            columConsumer.accept(StringUtils.getTargetColumn(col));
+                        }
+                    }
+                    parser = true;
+                }
+            }
+            if (!parser)
+                throw ExceptionUtils.mpe("JSqlParser parser error <%s>", selectSql);
+        } catch (Throwable throwable) {
+            throw new RuntimeException(throwable);
+        }
+    }
+}
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
index f1f69ec..3cf2ef9 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/pom.xml
@@ -41,9 +41,14 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-adapter-jsqlparser</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-adapter-jsqlparser-v46</artifactId>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/ITableInfoAdapter.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/IAdapter.java
similarity index 89%
rename from mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/ITableInfoAdapter.java
rename to mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/IAdapter.java
index 6a8e90d..1cee471 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/ITableInfoAdapter.java
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/IAdapter.java
@@ -7,6 +7,7 @@ import org.apache.ibatis.session.Configuration;
 
 import java.lang.reflect.Field;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -14,7 +15,7 @@ import java.util.stream.Collectors;
  * @author yulichang
  * @since 1.4.3
  */
-public interface ITableInfoAdapter {
+public interface IAdapter {
 
     default boolean mpjHasLogic(TableInfo tableInfo) {
         return tableInfo.isWithLogicDelete();
@@ -44,4 +45,6 @@ public interface ITableInfoAdapter {
         return tableInfo.getOrderByFields().stream().map(f ->
                 new OrderFieldInfo(f.getColumn(), f.getType(), f.getSort())).collect(Collectors.toList());
     }
+
+    void parserColum(String alias, String from, String selectSql, Consumer<String> columConsumer);
 }
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/TableInfoAdapterV33x.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/AdapterV33x.java
similarity index 79%
rename from mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/TableInfoAdapterV33x.java
rename to mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/AdapterV33x.java
index 9aefe80..d7ff421 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/TableInfoAdapterV33x.java
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/AdapterV33x.java
@@ -4,21 +4,23 @@ import com.baomidou.mybatisplus.core.MybatisPlusVersion;
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.github.yulichang.adapter.base.ITableInfoAdapter;
+import com.github.yulichang.adapter.base.IAdapter;
 import com.github.yulichang.adapter.base.metadata.OrderFieldInfo;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
+import com.github.yulichang.adapter.jsqlparser.v46.JSqlParserHelperV46;
 import org.apache.ibatis.session.Configuration;
 
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 /**
  * @author yulichang
  * @since 1.4.3
  */
-public class TableInfoAdapterV33x implements ITableInfoAdapter {
+public class AdapterV33x implements IAdapter {
 
     private static final boolean is330 = VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.3.0") == 0;
 
@@ -51,11 +53,16 @@ public class TableInfoAdapterV33x implements ITableInfoAdapter {
 
     @Override
     public Field mpjGetField(TableFieldInfo fieldInfo, Supplier<Field> supplier) {
-        return is330 ? supplier.get() : ITableInfoAdapter.super.mpjGetField(fieldInfo, null);
+        return is330 ? supplier.get() : IAdapter.super.mpjGetField(fieldInfo, null);
     }
 
     @Override
     public List<OrderFieldInfo> mpjGetOrderField(TableInfo tableInfo) {
         throw new UnsupportedOperationException("不支持排序");
     }
+
+    @Override
+    public void parserColum(String alias, String from, String selectSql, Consumer<String> columConsumer) {
+        JSqlParserHelperV46.parserColum(alias, from, selectSql, columConsumer);
+    }
 }
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/TableInfoAdapter3431.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/Adapter3431.java
similarity index 62%
rename from mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/TableInfoAdapter3431.java
rename to mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/Adapter3431.java
index eaf1081..91968a3 100644
--- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/TableInfoAdapter3431.java
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/Adapter3431.java
@@ -2,18 +2,22 @@ package com.github.yulichang.adapter.v3431;
 
 import com.baomidou.mybatisplus.core.MybatisPlusVersion;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.github.yulichang.adapter.base.ITableInfoAdapter;
+import com.github.yulichang.adapter.base.IAdapter;
 import com.github.yulichang.adapter.base.metadata.OrderFieldInfo;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
+import com.github.yulichang.adapter.jsqlparser.v46.JSqlParserHelperV46;
+import lombok.AllArgsConstructor;
 
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
  * @author yulichang
  * @since 1.4.7
  */
-public class TableInfoAdapter3431 implements ITableInfoAdapter {
+@AllArgsConstructor
+public class Adapter3431 implements IAdapter {
 
     private static final boolean v = VersionUtils.compare(MybatisPlusVersion.getVersion(), "3.4.3") < 0;
 
@@ -22,4 +26,9 @@ public class TableInfoAdapter3431 implements ITableInfoAdapter {
         return v ? null : tableInfo.getOrderByFields().stream().map(f ->
                 new OrderFieldInfo(f.getColumn(), f.getOrderByType(), f.getOrderBySort())).collect(Collectors.toList());
     }
+
+    @Override
+    public void parserColum(String alias, String from, String selectSql, Consumer<String> columConsumer) {
+        JSqlParserHelperV46.parserColum(alias, from, selectSql, columConsumer);
+    }
 }
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v355/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v355/pom.xml
new file mode 100644
index 0000000..955a389
--- /dev/null
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v355/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.github.yulichang</groupId>
+        <artifactId>mybatis-plus-join-adapter</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <artifactId>mybatis-plus-join-adapter-v355</artifactId>
+    <version>${revision}</version>
+    <name>mybatis-plus-join-adapter-v355</name>
+
+    <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
+    <url>https://github.com/yulichang/mybatis-plus-join</url>
+    <licenses>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <id>mybatis-plus-join</id>
+            <name>yulichang</name>
+            <email>yu_lichang@qq.com</email>
+        </developer>
+    </developers>
+    <scm>
+        <connection>scm:git:https://github.com/yulichang/mybatis-plus-join.git</connection>
+        <developerConnection>scm:git:https://github.com/yulichang/mybatis-plus-join.git</developerConnection>
+        <url>https://github.com/yulichang/mybatis-plus-join</url>
+    </scm>
+
+    <properties>
+        <jdkVersion>1.8</jdkVersion>
+        <jdkVersion.test>1.8</jdkVersion.test>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <github.global.server>github</github.global.server>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-adapter-base</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
+            <version>3.5.5</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v355/src/main/java/com/github/yulichang/adapter/v355/Adapter355.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v355/src/main/java/com/github/yulichang/adapter/v355/Adapter355.java
new file mode 100644
index 0000000..04704a0
--- /dev/null
+++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v355/src/main/java/com/github/yulichang/adapter/v355/Adapter355.java
@@ -0,0 +1,18 @@
+package com.github.yulichang.adapter.v355;
+
+import com.github.yulichang.adapter.base.IAdapter;
+import com.github.yulichang.adapter.jsqlparser.v46.JSqlParserHelperV46;
+
+import java.util.function.Consumer;
+
+/**
+ * @author yulichang
+ * @since 1.4.12
+ */
+public class Adapter355 implements IAdapter {
+
+    @Override
+    public void parserColum(String alias, String from, String selectSql, Consumer<String> columConsumer) {
+        JSqlParserHelperV46.parserColum(alias, from, selectSql, columConsumer);
+    }
+}
\ No newline at end of file
diff --git a/mybatis-plus-join-adapter/pom.xml b/mybatis-plus-join-adapter/pom.xml
index d0df29f..32e3645 100644
--- a/mybatis-plus-join-adapter/pom.xml
+++ b/mybatis-plus-join-adapter/pom.xml
@@ -17,6 +17,9 @@
         <module>mybatis-plus-join-adapter-v33x</module>
         <module>mybatis-plus-join-adapter-v3431</module>
         <module>mybatis-plus-join-adapter-v352</module>
+        <module>mybatis-plus-join-adapter-v355</module>
+        <module>jsqlparser/mybatis-plus-join-adapter-jsqlparser</module>
+        <module>jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46</module>
     </modules>
 
     <description>An enhanced toolkit of Mybatis-Plus to simplify development.</description>
@@ -40,4 +43,11 @@
         <url>https://github.com/yulichang/mybatis-plus-join</url>
     </scm>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/mybatis-plus-join-core/pom.xml b/mybatis-plus-join-core/pom.xml
index 6a67863..2d31e0c 100644
--- a/mybatis-plus-join-core/pom.xml
+++ b/mybatis-plus-join-core/pom.xml
@@ -54,6 +54,11 @@
             <artifactId>mybatis-plus-join-adapter-v352</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join-adapter-v355</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/Adapter.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/Adapter.java
new file mode 100644
index 0000000..0d685d6
--- /dev/null
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/Adapter.java
@@ -0,0 +1,18 @@
+package com.github.yulichang.adapter;
+
+import com.github.yulichang.adapter.base.IAdapter;
+import com.github.yulichang.adapter.jsqlparser.JSqlParserHelper;
+
+import java.util.function.Consumer;
+
+/**
+ * @author yulichang
+ * @since 1.4.3
+ */
+public class Adapter implements IAdapter {
+
+    @Override
+    public void parserColum(String alias, String from, String selectSql, Consumer<String> columConsumer) {
+        JSqlParserHelper.parserColum(alias, from, selectSql, columConsumer);
+    }
+}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java
index 3b91ccf..d17b3f4 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java
@@ -2,10 +2,12 @@ package com.github.yulichang.adapter;
 
 import com.baomidou.mybatisplus.core.MybatisPlusVersion;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
-import com.github.yulichang.adapter.base.ITableInfoAdapter;
+import com.github.yulichang.adapter.base.IAdapter;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
-import com.github.yulichang.adapter.v33x.TableInfoAdapterV33x;
-import com.github.yulichang.adapter.v3431.TableInfoAdapter3431;
+import com.github.yulichang.adapter.v33x.AdapterV33x;
+import com.github.yulichang.adapter.v3431.Adapter3431;
+import com.github.yulichang.adapter.v355.Adapter355;
+import lombok.Getter;
 
 /**
  * @author yulichang
@@ -13,22 +15,23 @@ import com.github.yulichang.adapter.v3431.TableInfoAdapter3431;
  */
 public class AdapterHelper {
 
-    private static final ITableInfoAdapter adapter;
+    @Getter
+    private static final IAdapter adapter;
+
 
     static {
         String version = MybatisPlusVersion.getVersion();
-        if (VersionUtils.compare(version, "3.5.4") >= 0) {
-            adapter = new TableInfoAdapter();
+
+        if (VersionUtils.compare(version, "3.5.6") >= 0) {
+            adapter = new Adapter();
+        } else if (VersionUtils.compare(version, "3.5.4") >= 0) {
+            adapter = new Adapter355();
         } else if (VersionUtils.compare(version, "3.4.0") >= 0) {
-            adapter = new TableInfoAdapter3431();
+            adapter = new Adapter3431();
         } else if (VersionUtils.compare(version, "3.3.0") >= 0) {
-            adapter = new TableInfoAdapterV33x();
+            adapter = new AdapterV33x();
         } else {
             throw ExceptionUtils.mpe("MPJ需要MP版本3.3.0+，当前MP版本%s", version);
         }
     }
-
-    public static ITableInfoAdapter getTableInfoAdapter() {
-        return adapter;
-    }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/TableInfoAdapter.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/TableInfoAdapter.java
deleted file mode 100644
index 145a51c..0000000
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/TableInfoAdapter.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.yulichang.adapter;
-
-import com.github.yulichang.adapter.base.ITableInfoAdapter;
-
-/**
- * @author yulichang
- * @since 1.4.3
- */
-public class TableInfoAdapter implements ITableInfoAdapter {
-
-}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
index 3aa43a6..0d559f4 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/ConfigProperties.java
@@ -1,7 +1,7 @@
 package com.github.yulichang.config;
 
 import com.github.yulichang.adapter.AdapterHelper;
-import com.github.yulichang.adapter.base.ITableInfoAdapter;
+import com.github.yulichang.adapter.base.IAdapter;
 import com.github.yulichang.config.enums.IfExistsEnum;
 import com.github.yulichang.config.enums.LogicDelTypeEnum;
 import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum;
@@ -45,7 +45,7 @@ public class ConfigProperties {
     /**
      * TableInfo适配器
      */
-    public static ITableInfoAdapter tableInfoAdapter = AdapterHelper.getTableInfoAdapter();
+    public static IAdapter tableInfoAdapter = AdapterHelper.getAdapter();
     /**
      * 子查询别名
      */
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
index 9f20dfe..3fa755c 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java
@@ -2,13 +2,16 @@ package com.github.yulichang.interceptor;
 
 import com.baomidou.mybatisplus.core.MybatisPlusVersion;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 import com.baomidou.mybatisplus.core.toolkit.*;
+import com.github.yulichang.adapter.AdapterHelper;
 import com.github.yulichang.adapter.base.tookit.VersionUtils;
 import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.interfaces.MPJBaseJoin;
 import com.github.yulichang.query.MPJQueryWrapper;
-import com.github.yulichang.toolkit.*;
+import com.github.yulichang.toolkit.Constant;
+import com.github.yulichang.toolkit.MPJReflectionKit;
+import com.github.yulichang.toolkit.MPJTableMapperHelper;
+import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.support.FieldCache;
 import com.github.yulichang.wrapper.interfaces.SelectWrapper;
 import com.github.yulichang.wrapper.resultmap.IResult;
@@ -205,7 +208,7 @@ public class MPJInterceptor implements Interceptor {
                         resultMappings.add(selectToResult(wrapper.getEntityClass(), i, field.getType(), builder));
                     }
                 } else if (wrapper.isResultMap()) {
-                    ThrowOptional.tryDo(() -> JSqlParserHelper.paresColum(wrapper, i.getColumn(), col -> {
+                    AdapterHelper.getAdapter().parserColum(wrapper.getAlias(), wrapper.getFrom(), i.getColumn(), col -> {
                         FieldCache strField = fieldMap.get(col);
                         columnSet.add(col);
                         if (Objects.nonNull(strField)) {
@@ -213,7 +216,7 @@ public class MPJInterceptor implements Interceptor {
                                     col, strField.getType());
                             resultMappings.add(selectToResult(wrapper.getEntityClass(), i, strField.getType(), builder));
                         }
-                    })).catchDo();
+                    });
                 }
             }
         }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java
index 8721079..960e073 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtDeleteJoinWrapper.java
@@ -168,17 +168,17 @@ public class KtDeleteJoinWrapper<T> extends KtAbstractLambdaWrapper<T, KtDeleteJ
         Class<T> entityClass = getEntityClass();
         TableInfo tableInfo = TableHelper.getAssert(entityClass);
         //检查
-        boolean mainLogic = AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo);
+        boolean mainLogic = AdapterHelper.getAdapter().mpjHasLogic(tableInfo);
         boolean check = classList.stream().allMatch(t -> {
             TableInfo ti = TableHelper.getAssert(t);
-            return mainLogic == AdapterHelper.getTableInfoAdapter().mpjHasLogic(ti);
+            return mainLogic == AdapterHelper.getAdapter().mpjHasLogic(ti);
         });
         if (!check) {
             throw ExceptionUtils.mpe("连表删除只适用于全部表(主表和副表)都是物理删除或全部都是逻辑删除, " +
                             "不支持同时存在物理删除和逻辑删除 [物理删除->(%s)] [逻辑删除->(%s)]",
-                    classList.stream().filter(t -> !AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.getAssert(t)))
+                    classList.stream().filter(t -> !AdapterHelper.getAdapter().mpjHasLogic(TableHelper.getAssert(t)))
                             .map(Class::getSimpleName).collect(Collectors.joining(StringPool.COMMA)),
-                    classList.stream().filter(t -> AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.getAssert(t)))
+                    classList.stream().filter(t -> AdapterHelper.getAdapter().mpjHasLogic(TableHelper.getAssert(t)))
                             .map(Class::getSimpleName).collect(Collectors.joining(StringPool.COMMA)));
         }
     }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java
index d6ac0cf..945d8ae 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java
@@ -201,12 +201,12 @@ public class KtUpdateJoinWrapper<T> extends KtAbstractLambdaWrapper<T, KtUpdateJ
             Assert.isTrue(tableList.contain(obj.getClass()), "更新的实体不是主表或关联表 <%>", obj.getClass().getSimpleName());
             TableInfo tableInfo = TableHelper.getAssert(obj.getClass());
             for (TableFieldInfo fieldInfo : tableInfo.getFieldList()) {
-                if (AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo) && fieldInfo.isLogicDelete()) {
+                if (AdapterHelper.getAdapter().mpjHasLogic(tableInfo) && fieldInfo.isLogicDelete()) {
                     continue;
                 }
                 Object val;
                 try {
-                    Field field = AdapterHelper.getTableInfoAdapter().mpjGetField(fieldInfo, () -> {
+                    Field field = AdapterHelper.getAdapter().mpjGetField(fieldInfo, () -> {
                         Field field1 = ReflectionKit.getFieldMap(obj.getClass()).get(fieldInfo.getProperty());
                         field1.setAccessible(true);
                         return field1;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
index 7cd6bef..43d923f 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Query.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.yulichang.kt.segments.FuncArgs;
+import com.github.yulichang.toolkit.Constant;
 import com.github.yulichang.toolkit.KtUtils;
 import com.github.yulichang.toolkit.MPJReflectionKit;
 import com.github.yulichang.toolkit.TableHelper;
@@ -98,7 +99,7 @@ public interface Query<Children> extends Serializable {
      * @param column 列
      */
     default Children selectAs(String column, KProperty<?> alias) {
-        getSelectColum().add(new SelectString(column + Constants.AS + alias.getName(), alias.getName()));
+        getSelectColum().add(new SelectString(column + Constant.AS + alias.getName(), alias.getName()));
         return getChildren();
     }
 
@@ -111,7 +112,7 @@ public interface Query<Children> extends Serializable {
         Map<String, SelectCache> cacheMap = ColumnCache.getMapField(KtUtils.ref(column));
         SelectCache cache = cacheMap.get(column.getName());
         getSelectColum().add(new SelectString(
-                index + Constants.DOT + cache.getColumn() + Constants.AS + alias.getName(), alias.getName()));
+                index + Constants.DOT + cache.getColumn() + Constant.AS + alias.getName(), alias.getName()));
         return getChildren();
     }
 
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/DeleteJoin.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/DeleteJoin.java
index 332fcb9..6396245 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/DeleteJoin.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/DeleteJoin.java
@@ -28,7 +28,7 @@ public class DeleteJoin extends MPJAbstractMethod {
     @SuppressWarnings("DuplicatedCode")
     public MappedStatement injectMappedStatement(Class<?> mapperClass, Class<?> modelClass, TableInfo tableInfo) {
         SqlMethod sqlMethod = SqlMethod.LOGIC_DELETE_JOIN;
-        if (AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo)) {
+        if (AdapterHelper.getAdapter().mpjHasLogic(tableInfo)) {
             String sql = String.format(sqlMethod.getSql(), sqlFirst(), mpjTableName(tableInfo), sqlAlias(), sqlFrom(),
                     mpjDeleteLogic(tableInfo), sqlWhereEntityWrapper(true, tableInfo), sqlComment());
             SqlSource sqlSource = languageDriver.createSqlSource(configuration, removeExtraWhitespaces(sql), modelClass);
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java
index 8967940..8742ad9 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java
@@ -73,7 +73,7 @@ public interface MPJBaseMethod extends Constants {
         /* 不存在排序字段，直接返回空 */
         List<OrderFieldInfo> orderByFields;
         try {
-            orderByFields = AdapterHelper.getTableInfoAdapter().mpjGetOrderField(tableInfo);
+            orderByFields = AdapterHelper.getAdapter().mpjGetOrderField(tableInfo);
         } catch (Exception e) {
             return StringPool.EMPTY;
         }
@@ -226,7 +226,7 @@ public interface MPJBaseMethod extends Constants {
         return tableInfo.getFieldList().stream()
                 .filter(i -> {
                     if (ignoreLogicDelFiled) {
-                        return !(AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo) && i.isLogicDelete());
+                        return !(AdapterHelper.getAdapter().mpjHasLogic(tableInfo) && i.isLogicDelete());
                     }
                     return true;
                 }).map(i -> mpjGetSqlSet(i, newPrefix)).filter(Objects::nonNull).collect(joining(NEWLINE));
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java
index c9fd322..6b7a11a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/UpdateJoin.java
@@ -64,7 +64,7 @@ public class UpdateJoin extends MPJAbstractMethod {
         if (fieldStrategy == FieldStrategy.NEVER) {
             return null;
         }
-        if (AdapterHelper.getTableInfoAdapter().mpjIsPrimitive(tableFieldInfo) || fieldStrategy == FieldStrategy.IGNORED) {
+        if (AdapterHelper.getAdapter().mpjIsPrimitive(tableFieldInfo) || fieldStrategy == FieldStrategy.IGNORED) {
             return sqlScript;
         }
         if (fieldStrategy == FieldStrategy.NOT_EMPTY && tableFieldInfo.isCharSequence()) {
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JSqlParserHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JSqlParserHelper.java
deleted file mode 100644
index b42c471..0000000
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/JSqlParserHelper.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.github.yulichang.toolkit;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.github.yulichang.wrapper.interfaces.SelectWrapper;
-import net.sf.jsqlparser.parser.CCJSqlParserUtil;
-import net.sf.jsqlparser.schema.Column;
-import net.sf.jsqlparser.statement.Statement;
-import net.sf.jsqlparser.statement.select.*;
-
-import java.util.function.Consumer;
-
-/**
- * @author yulichang
- * @since 1.4.10
- */
-public final class JSqlParserHelper {
-
-    /**
-     * 解析sql select字段 刚接触JSqlParser有更好的用法欢迎PR
-     *
-     * @param selectSql     要解析的select sql片段
-     * @param columConsumer 解析的字段处理
-     */
-    public static void paresColum(SelectWrapper<?, ?> wrapper, String selectSql, Consumer<String> columConsumer) throws Exception {
-        Statement statement = CCJSqlParserUtil.parse(String.format("SELECT %s FROM table %s %s", selectSql, wrapper.getAlias(), wrapper.getFrom()));
-        if (statement instanceof Select) {
-            Select select = (Select) statement;
-            SelectBody selectBody = select.getSelectBody();
-            if (selectBody instanceof PlainSelect) {
-                PlainSelect plainSelect = (PlainSelect) selectBody;
-                if (CollectionUtils.isNotEmpty(plainSelect.getSelectItems())) {
-                    for (SelectItem item : plainSelect.getSelectItems()) {
-                        if (item instanceof SelectExpressionItem) {
-                            String col;
-                            SelectExpressionItem selectExpressionItem = (SelectExpressionItem) item;
-                            if (null == selectExpressionItem.getAlias()) {
-                                if (selectExpressionItem.getExpression() instanceof Column) {
-                                    col = ((Column) selectExpressionItem.getExpression()).getColumnName();
-                                } else {
-                                    col = selectExpressionItem.getExpression().toString();
-                                }
-                            } else {
-                                col = selectExpressionItem.getAlias().getName();
-                            }
-                            if (StringUtils.isNotBlank(col)) {
-                                columConsumer.accept(StringUtils.getTargetColumn(col));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
index ca2482d..707f4e7 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/KtWrapperUtils.java
@@ -98,7 +98,7 @@ public class KtWrapperUtils {
         }
         StringBuilder sb = new StringBuilder(StringPool.EMPTY);
         for (TableFieldInfo fieldInfo : tableInfo.getFieldList()) {
-            if (AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo) && fieldInfo.isLogicDelete()) {
+            if (AdapterHelper.getAdapter().mpjHasLogic(tableInfo) && fieldInfo.isLogicDelete()) {
                 continue;
             }
             Object val;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java
index 615a1cd..8fd1356 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java
@@ -98,7 +98,7 @@ public class WrapperUtils {
         }
         StringBuilder sb = new StringBuilder(StringPool.EMPTY);
         for (TableFieldInfo fieldInfo : tableInfo.getFieldList()) {
-            if (AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo) && fieldInfo.isLogicDelete()) {
+            if (AdapterHelper.getAdapter().mpjHasLogic(tableInfo) && fieldInfo.isLogicDelete()) {
                 continue;
             }
             Object val;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java
index bfbb174..3eb7da4 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java
@@ -171,17 +171,17 @@ public class DeleteJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, DeleteJoi
         Class<T> entityClass = getEntityClass();
         TableInfo tableInfo = TableHelper.getAssert(entityClass);
         //检查
-        boolean mainLogic = AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo);
+        boolean mainLogic = AdapterHelper.getAdapter().mpjHasLogic(tableInfo);
         boolean check = classList.stream().allMatch(t -> {
             TableInfo ti = TableHelper.getAssert(t);
-            return mainLogic == AdapterHelper.getTableInfoAdapter().mpjHasLogic(ti);
+            return mainLogic == AdapterHelper.getAdapter().mpjHasLogic(ti);
         });
         if (!check) {
             throw ExceptionUtils.mpe("连表删除只适用于全部表(主表和副表)都是物理删除或全部都是逻辑删除, " +
                             "不支持同时存在物理删除和逻辑删除 [物理删除->(%s)] [逻辑删除->(%s)]",
-                    classList.stream().filter(t -> !AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.getAssert(t)))
+                    classList.stream().filter(t -> !AdapterHelper.getAdapter().mpjHasLogic(TableHelper.getAssert(t)))
                             .map(Class::getSimpleName).collect(Collectors.joining(StringPool.COMMA)),
-                    classList.stream().filter(t -> AdapterHelper.getTableInfoAdapter().mpjHasLogic(TableHelper.getAssert(t)))
+                    classList.stream().filter(t -> AdapterHelper.getAdapter().mpjHasLogic(TableHelper.getAssert(t)))
                             .map(Class::getSimpleName).collect(Collectors.joining(StringPool.COMMA)));
         }
     }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
index 1df4243..4dd1189 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
@@ -203,12 +203,12 @@ public class UpdateJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, UpdateJoi
             Assert.isTrue(tableList.contain(obj.getClass()), "更新的实体不是主表或关联表 <%>", obj.getClass().getSimpleName());
             TableInfo tableInfo = TableHelper.getAssert(obj.getClass());
             for (TableFieldInfo fieldInfo : tableInfo.getFieldList()) {
-                if (AdapterHelper.getTableInfoAdapter().mpjHasLogic(tableInfo) && fieldInfo.isLogicDelete()) {
+                if (AdapterHelper.getAdapter().mpjHasLogic(tableInfo) && fieldInfo.isLogicDelete()) {
                     continue;
                 }
                 Object val;
                 try {
-                    Field field = AdapterHelper.getTableInfoAdapter().mpjGetField(fieldInfo, () -> {
+                    Field field = AdapterHelper.getAdapter().mpjGetField(fieldInfo, () -> {
                         Field field1 = ReflectionKit.getFieldMap(obj.getClass()).get(fieldInfo.getProperty());
                         field1.setAccessible(true);
                         return field1;
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
index a624a20..2a6d9a6 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Query.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.github.yulichang.toolkit.Constant;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.MPJReflectionKit;
 import com.github.yulichang.toolkit.TableHelper;
@@ -97,7 +98,7 @@ public interface Query<Children> extends Serializable {
      */
     default <E> Children selectAs(String column, SFunction<E, ?> alias) {
         String name = LambdaUtils.getName(alias);
-        getSelectColum().add(new SelectString(column + Constants.AS + name, name));
+        getSelectColum().add(new SelectString(column + Constant.AS + name, name));
         return getChildren();
     }
 
@@ -110,7 +111,7 @@ public interface Query<Children> extends Serializable {
         Map<String, SelectCache> cacheMap = ColumnCache.getMapField(LambdaUtils.getEntityClass(column));
         SelectCache cache = cacheMap.get(LambdaUtils.getName(column));
         String name = LambdaUtils.getName(alias);
-        getSelectColum().add(new SelectString(index + Constants.DOT + cache.getColumn() + Constants.AS + name, name));
+        getSelectColum().add(new SelectString(index + Constants.DOT + cache.getColumn() + Constant.AS + name, name));
         return getChildren();
     }
 
diff --git a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java
index 608fda7..4e40ba0 100644
--- a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java
+++ b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java
@@ -192,7 +192,7 @@ public class MPJTableFieldInfo {
         TableFieldInfo joinFieldInfo = joinTableInfo.getFieldList().stream().filter(f ->
                 f.getProperty().equals(this.joinProperty)).findFirst().orElse(null);
         if (joinFieldInfo == null) {
-            if (AdapterHelper.getTableInfoAdapter().mpjHasPK(joinTableInfo) && this.joinProperty.equals(joinTableInfo.getKeyProperty())) {
+            if (AdapterHelper.getAdapter().mpjHasPK(joinTableInfo) && this.joinProperty.equals(joinTableInfo.getKeyProperty())) {
                 this.joinColumn = joinTableInfo.getKeyColumn();
                 this.joinField = ReflectionKit.getFieldList(this.joinClass).stream().filter(i ->
                         i.getName().equals(joinTableInfo.getKeyProperty())).findFirst().orElse(null);
@@ -218,7 +218,7 @@ public class MPJTableFieldInfo {
         }
 
         TableInfo tableInfo = getTableInfo(this.entityType);
-        if (AdapterHelper.getTableInfoAdapter().mpjHasPK(tableInfo) && this.thisProperty.equals(tableInfo.getKeyProperty())) {
+        if (AdapterHelper.getAdapter().mpjHasPK(tableInfo) && this.thisProperty.equals(tableInfo.getKeyProperty())) {
             this.thisField = ReflectionKit.getFieldList(ClassUtils.getUserClass(entityType)).stream().filter(f ->
                     f.getName().equals(tableInfo.getKeyProperty())).findFirst().orElse(null);
             Assert.notNull(this.thisField, "注解属性thisField不存在 %s , %s", entityType.getName(),
@@ -313,7 +313,7 @@ public class MPJTableFieldInfo {
     }
 
     private Field getField(Class<?> table, TableFieldInfo tableFieldInfo) {
-        return AdapterHelper.getTableInfoAdapter().mpjGetField(tableFieldInfo, () ->
+        return AdapterHelper.getAdapter().mpjGetField(tableFieldInfo, () ->
                 ReflectionKit.getFieldMap(table).get(tableFieldInfo.getProperty()));
     }
 
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index ed19eb7..7d0e670 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -24,7 +24,7 @@
         <module>test-mapping</module>
 
         <!-- 以下两个模块需要jdk17+, 使用jdk8会出现编译错误, 如果有安装jdk17+可以打开这两个模块 -->
-<!--        <module>test-kotlin</module>-->
+        <!--        <module>test-kotlin</module>-->
         <!--        <module>test-springboot3-jdk17</module>-->
     </modules>
 
@@ -51,7 +51,7 @@
 
     <properties>
         <revision>1.4.11</revision>
-        <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
+        <mpj.mybatis.plus.version>3.5.6</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>
diff --git a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
index f76fbe8..be420d9 100644
--- a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
+++ b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <revision>1.4.11</revision>
-        <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
+        <mpj.mybatis.plus.version>3.5.6</mpj.mybatis.plus.version>
 
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
diff --git a/pom.xml b/pom.xml
index cb2c761..231bc6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 
     <properties>
         <revision>1.4.11</revision>
-        <mpj.mybatis.plus.version>3.5.5</mpj.mybatis.plus.version>
+        <mpj.mybatis.plus.version>3.5.6</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>

From 67aa1b106ae34eac39be94428c0ac28482867c46 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 10 Apr 2024 10:17:13 +0800
Subject: [PATCH 86/88] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20eqSql=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/kt/KtAbstractWrapper.java       |  6 ++++
 .../wrapper/JoinAbstractWrapper.java          | 12 +++++++
 .../yulichang/wrapper/interfaces/Func.java    | 24 ++++++++++++++
 .../yulichang/wrapper/interfaces/FuncStr.java | 19 ++++++++++++
 .../yulichang/test/join/m/EqSqlTest.java      | 31 +++++++++++++++++++
 5 files changed, 92 insertions(+)
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/EqSqlTest.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
index 8108791..abf744f 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtAbstractWrapper.java
@@ -996,6 +996,12 @@ public abstract class KtAbstractWrapper<T, Children extends KtAbstractWrapper<T,
                 () -> String.format("(%s)", inValue)));
     }
 
+    @Override
+    public Children eqSql(boolean condition, String column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), EQ,
+                () -> String.format("(%s)", inValue)));
+    }
+
     @Override
     public Children notInSql(boolean condition, String column, String inValue) {
         return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), NOT_IN,
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 23f0ac2..8f27151 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
@@ -439,6 +439,12 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
                 () -> String.format("(%s)", inValue)));
     }
 
+    @Override
+    public <R> Children eqSql(boolean condition, String alias, SFunction<R, ?> column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(index, alias, column), EQ,
+                () -> String.format("(%s)", inValue)));
+    }
+
     @Override
     public <R> Children groupBy(boolean condition, String alias, List<SFunction<R, ?>> columns) {
         return maybeDo(condition, () -> {
@@ -1110,6 +1116,12 @@ public abstract class JoinAbstractWrapper<T, Children extends JoinAbstractWrappe
                 () -> String.format("(%s)", inValue)));
     }
 
+    @Override
+    public Children eqSql(boolean condition, String column, String inValue) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), EQ,
+                () -> String.format("(%s)", inValue)));
+    }
+
     @Override
     public Children notInSql(boolean condition, String column, String inValue) {
         return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), NOT_IN,
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java
index 0e7b114..38144c1 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Func.java
@@ -311,6 +311,30 @@ public interface Func<Children> extends Serializable {
      */
     <R> Children leSql(boolean condition, String alias, SFunction<R, ?> column, String inValue);
 
+    default <R> Children eqSql(SFunction<R, ?> column, String inValue) {
+        return eqSql(true, null, column, inValue);
+    }
+
+    default <R> Children eqSql(String alias, SFunction<R, ?> column, String inValue) {
+        return eqSql(true, alias, column, inValue);
+    }
+
+    default <R> Children eqSql(boolean condition, SFunction<R, ?> column, String inValue) {
+        return eqSql(condition, null, column, inValue);
+    }
+
+    /**
+     * 字段 <= ( sql语句 )
+     * <p>例1: leSql("id", "1, 2, 3, 4, 5, 6")</p>
+     * <p>例1: leSql("id", "select id from table where name = 'JunJun'")</p>
+     *
+     * @param condition 执行条件
+     * @param column    字段
+     * @param inValue   sql语句 ---&gt; 1,2,3,4,5,6 或者 select id from table where id &lt; 3
+     * @return children
+     */
+    <R> Children eqSql(boolean condition, String alias, SFunction<R, ?> column, String inValue);
+
     default <R> Children groupBy(SFunction<R, ?> column) {
         return groupBy(true, (String) null, column);
     }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/FuncStr.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/FuncStr.java
index 570636a..2fb1d38 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/FuncStr.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/FuncStr.java
@@ -228,6 +228,25 @@ public interface FuncStr<Children, R> extends Serializable {
      */
     Children leSql(boolean condition, R column, String inValue);
 
+    /**
+     * ignore
+     */
+    default Children eqSql(R column, String inValue) {
+        return eqSql(true, column, inValue);
+    }
+
+    /**
+     * 字段 = ( sql语句 )
+     * <p>例1: eqSql("id", "1, 2, 3, 4, 5, 6")</p>
+     * <p>例1: eqSql("id", "select id from table where name = 'JunJun'")</p>
+     *
+     * @param condition
+     * @param column
+     * @param inValue
+     * @return
+     */
+    Children eqSql(boolean condition, R column, String inValue);
+
     /**
      * ignore
      */
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/EqSqlTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/EqSqlTest.java
new file mode 100644
index 0000000..eec0b25
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/EqSqlTest.java
@@ -0,0 +1,31 @@
+package com.github.yulichang.test.join.m;
+
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.toolkit.JoinWrappers;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class EqSqlTest {
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+
+    @Test
+    void eqSql() {
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
+                "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.id = (SELECT id FROM `user` LIMIT 1))");
+        JoinWrappers.lambda(UserDO.class).eqSql(UserDO::getId, "select id from `user` limit 1").list();
+
+        ThreadLocalUtils.set("SELECT t.id, t.pid, t.`name`, t.`json`, t.sex, t.head_img, t.create_time, t.address_id, " +
+                "t.address_id2, t.del, t.create_by, t.update_by FROM `user` t WHERE t.del = false AND (t.id = (SELECT id FROM `user` LIMIT 1))");
+        JoinWrappers.lambda(UserDO.class).eqSql("t.id", "select id from `user` limit 1").list();
+    }
+
+}

From cbc37091563febd8d2aff3f9d6cf2f1a331191fb Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 10 Apr 2024 11:22:02 +0800
Subject: [PATCH 87/88] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=87=AA=E5=A2=9E=20setIncrBy=20=E8=87=AA=E5=87=8F=20setDecrBy?=
 =?UTF-8?q?=20=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yulichang/kt/KtUpdateJoinWrapper.java     | 38 +++++++++++++++++--
 .../yulichang/kt/interfaces/Update.java       | 12 ++++++
 .../github/yulichang/toolkit/Constant.java    |  4 ++
 .../yulichang/wrapper/UpdateJoinWrapper.java  | 38 +++++++++++++++++--
 .../yulichang/wrapper/interfaces/Update.java  | 12 ++++++
 .../yulichang/test/join/m/UpdateIncTest.java  | 33 ++++++++++++++++
 6 files changed, 131 insertions(+), 6 deletions(-)
 create mode 100644 mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/UpdateIncTest.java

diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java
index 945d8ae..8b8f297 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/KtUpdateJoinWrapper.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.github.yulichang.adapter.AdapterHelper;
 import com.github.yulichang.kt.interfaces.Update;
+import com.github.yulichang.toolkit.Constant;
 import com.github.yulichang.toolkit.KtUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.TableList;
@@ -114,7 +115,27 @@ public class KtUpdateJoinWrapper<T> extends KtAbstractLambdaWrapper<T, KtUpdateJ
             if (Objects.isNull(updateSet)) {
                 updateSet = new ArrayList<>();
             }
-            updateSet.add(new UpdateSet(column, val, mapping));
+            updateSet.add(new UpdateSet(column, val, mapping, false, null));
+        });
+    }
+
+    @Override
+    public KtUpdateJoinWrapper<T> setIncrBy(boolean condition, KProperty<?> column, Number val) {
+        return maybeDo(condition, () -> {
+            if (Objects.isNull(updateSet)) {
+                updateSet = new ArrayList<>();
+            }
+            updateSet.add(new UpdateSet(column, val, null, true, Constant.PLUS));
+        });
+    }
+
+    @Override
+    public KtUpdateJoinWrapper<T> setDecrBy(boolean condition, KProperty<?> column, Number val) {
+        return maybeDo(condition, () -> {
+            if (Objects.isNull(updateSet)) {
+                updateSet = new ArrayList<>();
+            }
+            updateSet.add(new UpdateSet(column, val, null, true, Constant.DASH));
         });
     }
 
@@ -136,8 +157,15 @@ public class KtUpdateJoinWrapper<T> extends KtAbstractLambdaWrapper<T, KtUpdateJ
         }
         StringBuilder set = new StringBuilder(StringPool.EMPTY);
         if (CollectionUtils.isNotEmpty(updateSet)) {
-            set = new StringBuilder(updateSet.stream().map(i -> tableList.getPrefixByClass(KtUtils.ref(i.getColumn())) +
-                            Constants.DOT + getCache(i.getColumn()).getColumn() + Constants.EQUALS + formatParam(i.mapping, i.value))
+            set = new StringBuilder(updateSet.stream().map(i -> {
+                        String col = tableList.getPrefixByClass(KtUtils.ref(i.getColumn())) +
+                                Constants.DOT + getCache(i.getColumn()).getColumn();
+                        if (i.incOrDnc) {
+                            return col + Constants.EQUALS + col + i.cal + i.value;
+                        } else {
+                            return col + Constants.EQUALS + formatParam(i.mapping, i.value);
+                        }
+                    })
                     .collect(Collectors.joining(StringPool.COMMA)) + StringPool.COMMA);
         }
         if (CollectionUtils.isNotEmpty(sqlSet)) {
@@ -253,5 +281,9 @@ public class KtUpdateJoinWrapper<T> extends KtAbstractLambdaWrapper<T, KtUpdateJ
         private Object value;
 
         private String mapping;
+
+        private boolean incOrDnc;
+
+        private String cal;
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Update.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Update.java
index df9d64c..c86f718 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Update.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/kt/interfaces/Update.java
@@ -50,6 +50,18 @@ public interface Update<Children> extends Serializable {
      */
     Children set(boolean condition, KProperty<?> column, Object val, String mapping);
 
+    default Children setIncrBy(KProperty<?> column, Number val) {
+        return setIncrBy(true, column, val);
+    }
+
+    Children setIncrBy(boolean condition, KProperty<?> column, Number val);
+
+    default Children setDecrBy(KProperty<?> column, Number val) {
+        return setDecrBy(true, column, val);
+    }
+
+    Children setDecrBy(boolean condition, KProperty<?> column, Number val);
+
     /**
      * ignore
      */
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/Constant.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/Constant.java
index 0488cc0..150bf27 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/Constant.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/Constant.java
@@ -7,6 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
  */
 public interface Constant {
 
+    String PLUS = " + ";
+
+    String DASH = " - ";
+
     String AS = " AS ";
 
     String ON = " ON ";
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
index 4dd1189..8ab6a9d 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.github.yulichang.adapter.AdapterHelper;
+import com.github.yulichang.toolkit.Constant;
 import com.github.yulichang.toolkit.LambdaUtils;
 import com.github.yulichang.toolkit.TableHelper;
 import com.github.yulichang.toolkit.TableList;
@@ -114,7 +115,27 @@ public class UpdateJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, UpdateJoi
             if (Objects.isNull(updateSet)) {
                 updateSet = new ArrayList<>();
             }
-            updateSet.add(new UpdateSet(column, val, mapping));
+            updateSet.add(new UpdateSet(column, val, mapping, false, null));
+        });
+    }
+
+    @Override
+    public <R> UpdateJoinWrapper<T> setIncrBy(boolean condition, SFunction<R, ?> column, Number val) {
+        return maybeDo(condition, () -> {
+            if (Objects.isNull(updateSet)) {
+                updateSet = new ArrayList<>();
+            }
+            updateSet.add(new UpdateSet(column, val, null, true, Constant.PLUS));
+        });
+    }
+
+    @Override
+    public <R> UpdateJoinWrapper<T> setDecrBy(boolean condition, SFunction<R, ?> column, Number val) {
+        return maybeDo(condition, () -> {
+            if (Objects.isNull(updateSet)) {
+                updateSet = new ArrayList<>();
+            }
+            updateSet.add(new UpdateSet(column, val, null, true, Constant.DASH));
         });
     }
 
@@ -137,8 +158,15 @@ public class UpdateJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, UpdateJoi
         }
         StringBuilder set = new StringBuilder(StringPool.EMPTY);
         if (CollectionUtils.isNotEmpty(updateSet)) {
-            set = new StringBuilder(updateSet.stream().map(i -> tableList.getPrefixByClass(LambdaUtils.getEntityClass(i.getColumn())) +
-                            Constants.DOT + getCache(i.getColumn()).getColumn() + Constants.EQUALS + formatParam(i.mapping, i.value))
+            set = new StringBuilder(updateSet.stream().map(i -> {
+                        String col = tableList.getPrefixByClass(LambdaUtils.getEntityClass(i.getColumn())) +
+                                Constants.DOT + getCache(i.getColumn()).getColumn();
+                        if (i.incOrDnc) {
+                            return col + Constants.EQUALS + col + i.cal + i.value;
+                        } else {
+                            return col + Constants.EQUALS + formatParam(i.mapping, i.value);
+                        }
+                    })
                     .collect(Collectors.joining(StringPool.COMMA)) + StringPool.COMMA);
         }
         if (CollectionUtils.isNotEmpty(sqlSet)) {
@@ -255,5 +283,9 @@ public class UpdateJoinWrapper<T> extends JoinAbstractLambdaWrapper<T, UpdateJoi
         private Object value;
 
         private String mapping;
+
+        private boolean incOrDnc;
+
+        private String cal;
     }
 }
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Update.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Update.java
index 3130c26..a05b97a 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Update.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/interfaces/Update.java
@@ -50,6 +50,18 @@ public interface Update<Children> extends Serializable {
      */
     <R> Children set(boolean condition, SFunction<R, ?> column, Object val, String mapping);
 
+    default <R> Children setIncrBy(SFunction<R, ?> column, Number val) {
+        return setIncrBy(true, column, val);
+    }
+
+    <R> Children setIncrBy(boolean condition, SFunction<R, ?> column, Number val);
+
+    default <R> Children setDecrBy(SFunction<R, ?> column, Number val) {
+        return setDecrBy(true, column, val);
+    }
+
+    <R> Children setDecrBy(boolean condition, SFunction<R, ?> column, Number val);
+
     /**
      * ignore
      */
diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/UpdateIncTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/UpdateIncTest.java
new file mode 100644
index 0000000..4d4ceaa
--- /dev/null
+++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/m/UpdateIncTest.java
@@ -0,0 +1,33 @@
+package com.github.yulichang.test.join.m;
+
+import com.github.yulichang.test.join.entity.UserDO;
+import com.github.yulichang.test.util.Reset;
+import com.github.yulichang.test.util.ThreadLocalUtils;
+import com.github.yulichang.toolkit.JoinWrappers;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class UpdateIncTest {
+
+    @BeforeEach
+    void setUp() {
+        Reset.reset();
+    }
+
+
+    @Test
+    void eqSql() {
+        ThreadLocalUtils.set("UPDATE `user` t SET t.id = t.id + 100 WHERE t.del = false");
+        JoinWrappers.update(UserDO.class).setIncrBy(UserDO::getId,100).update();
+
+        JoinWrappers.lambda(UserDO.class).list().forEach(System.out::println);
+
+        ThreadLocalUtils.set("UPDATE `user` t SET t.id = t.id - 100 WHERE t.del = false");
+        JoinWrappers.update(UserDO.class).setDecrBy(UserDO::getId,100).update();
+
+        JoinWrappers.lambda(UserDO.class).list().forEach(System.out::println);
+    }
+
+}

From 84a1cb19a5f18cec4d5d9992fb7fa896f87d03c8 Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Wed, 10 Apr 2024 11:24:51 +0800
Subject: [PATCH 88/88] 1.4.12

---
 README-zh.md                                                  | 4 ++--
 README.md                                                     | 4 ++--
 .../com/github/yulichang/config/MPJInterceptorConfig.java     | 2 +-
 mybatis-plus-join-test/pom.xml                                | 2 +-
 mybatis-plus-join-test/test-springboot3-jdk17/pom.xml         | 2 +-
 mybatis-plus-join/pom.xml                                     | 2 +-
 pom.xml                                                       | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README-zh.md b/README-zh.md
index 81272a5..3ea7de5 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -47,12 +47,12 @@ QQ群:680016987  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.11</version>
+      <version>1.4.12</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.11'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.12'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/README.md b/README.md
index f866290..a414292 100644
--- a/README.md
+++ b/README.md
@@ -47,12 +47,12 @@ QQ群:680016987  或者
   <dependency>
       <groupId>com.github.yulichang</groupId>
       <artifactId>mybatis-plus-join-boot-starter</artifactId>
-      <version>1.4.11</version>
+      <version>1.4.12</version>
   </dependency>
   ```
 - Gradle
   ```
-   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.11'
+   implementation 'com.github.yulichang:mybatis-plus-join-boot-starter:1.4.12'
   ```
   或者clone代码到本地执行 mvn install, 再引入以上依赖  
   <br>
diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
index 9816dd2..2cf4731 100644
--- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
+++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/MPJInterceptorConfig.java
@@ -30,7 +30,7 @@ public class MPJInterceptorConfig {
             System.out.println(" _ _   |_  _ _|_. ___ _ |    _  .  _  .  _  \n" +
                     "| | |\\/|_)(_| | |_\\  |_)||_|_\\  | (_) | | | \n" +
                     "     /               |          /\n" +
-                    "                                    1.4.11");
+                    "                                    1.4.12");
         }
     }
 
diff --git a/mybatis-plus-join-test/pom.xml b/mybatis-plus-join-test/pom.xml
index 7d0e670..1bad1ea 100644
--- a/mybatis-plus-join-test/pom.xml
+++ b/mybatis-plus-join-test/pom.xml
@@ -50,7 +50,7 @@
     </scm>
 
     <properties>
-        <revision>1.4.11</revision>
+        <revision>1.4.12</revision>
         <mpj.mybatis.plus.version>3.5.6</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>
diff --git a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
index be420d9..0364d8d 100644
--- a/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
+++ b/mybatis-plus-join-test/test-springboot3-jdk17/pom.xml
@@ -14,7 +14,7 @@
     <artifactId>test-springboot3-jdk17</artifactId>
 
     <properties>
-        <revision>1.4.11</revision>
+        <revision>1.4.12</revision>
         <mpj.mybatis.plus.version>3.5.6</mpj.mybatis.plus.version>
 
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/mybatis-plus-join/pom.xml b/mybatis-plus-join/pom.xml
index 65fd821..c9bb68d 100644
--- a/mybatis-plus-join/pom.xml
+++ b/mybatis-plus-join/pom.xml
@@ -41,7 +41,7 @@
     </scm>
 
     <properties>
-        <revision>1.4.11</revision>
+        <revision>1.4.12</revision>
 
         <jdkVersion>1.8</jdkVersion>
         <jdkVersion.test>1.8</jdkVersion.test>
diff --git a/pom.xml b/pom.xml
index 231bc6f..8eab3fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
     </modules>
 
     <properties>
-        <revision>1.4.11</revision>
+        <revision>1.4.12</revision>
         <mpj.mybatis.plus.version>3.5.6</mpj.mybatis.plus.version>
 
         <jdkVersion>1.8</jdkVersion>