From 9a7b1503ed896bbd7918c8dd2b5e779e50580a25 Mon Sep 17 00:00:00 2001
From: admin <570810310@qq.com>
Date: Mon, 31 May 2021 10:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=B9=B6=E4=B8=94?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../github/yulichang/base/MPJBaseService.java   |  1 -
 .../yulichang/toolkit/sql/SqlScriptUtils.java   | 17 ++++++-----------
 .../toolkit/support/SerializedLambda.java       |  7 +------
 .../yulichang/wrapper/MPJLambdaWrapper.java     |  5 ++++-
 .../wrapper/interfaces/on/OnCompare.java        |  2 ++
 .../wrapper/interfaces/on/OnFunction.java       |  6 ++++++
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/github/yulichang/base/MPJBaseService.java b/src/main/java/com/github/yulichang/base/MPJBaseService.java
index 4bb105b..1d67276 100644
--- a/src/main/java/com/github/yulichang/base/MPJBaseService.java
+++ b/src/main/java/com/github/yulichang/base/MPJBaseService.java
@@ -38,7 +38,6 @@ public interface MPJBaseService<T> extends IService<T> {
      */
     List<Map<String, Object>> selectJoinMaps(MPJBaseJoin wrapper);
 
-
     /**
      * 连接查询返回Map集合并分页
      */
diff --git a/src/main/java/com/github/yulichang/toolkit/sql/SqlScriptUtils.java b/src/main/java/com/github/yulichang/toolkit/sql/SqlScriptUtils.java
index 8e54368..a69ddf8 100644
--- a/src/main/java/com/github/yulichang/toolkit/sql/SqlScriptUtils.java
+++ b/src/main/java/com/github/yulichang/toolkit/sql/SqlScriptUtils.java
@@ -6,14 +6,9 @@ import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.TypeHandler;
 
 /**
- * <p>
- * sql 脚本工具类
- * </p>
- *
- * @author miemie
- * @since 2018-08-15
+ * copy mp 3.4.3 {@link com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils}
  */
-@SuppressWarnings("serial")
+@SuppressWarnings("all")
 public abstract class SqlScriptUtils implements Constants {
 
     /**
@@ -73,10 +68,10 @@ public abstract class SqlScriptUtils implements Constants {
      */
     public static String convertChoose(final String whenTest, final String whenSqlScript, final String otherwise) {
         return "<choose>" + NEWLINE
-            + "<when test=\"" + whenTest + QUOTE + RIGHT_CHEV + NEWLINE
-            + whenSqlScript + NEWLINE + "</when>" + NEWLINE
-            + "<otherwise>" + otherwise + "</otherwise>" + NEWLINE
-            + "</choose>";
+                + "<when test=\"" + whenTest + QUOTE + RIGHT_CHEV + NEWLINE
+                + whenSqlScript + NEWLINE + "</when>" + NEWLINE
+                + "<otherwise>" + otherwise + "</otherwise>" + NEWLINE
+                + "</choose>";
     }
 
     /**
diff --git a/src/main/java/com/github/yulichang/toolkit/support/SerializedLambda.java b/src/main/java/com/github/yulichang/toolkit/support/SerializedLambda.java
index 366e73a..98c9c5d 100644
--- a/src/main/java/com/github/yulichang/toolkit/support/SerializedLambda.java
+++ b/src/main/java/com/github/yulichang/toolkit/support/SerializedLambda.java
@@ -8,12 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import java.io.*;
 
 /**
- * 这个类是从 {@link java.lang.invoke.SerializedLambda} 里面 copy 过来的，
- * 字段信息完全一样
- * <p>负责将一个支持序列的 Function 序列化为 SerializedLambda</p>
- *
- * @author HCL
- * @since 2018/05/10
+ * copy mp before 3.4.3 {@link com.baomidou.mybatisplus.core.toolkit.support.SerializedLambda}
  */
 @SuppressWarnings("unused")
 public class SerializedLambda implements Serializable {
diff --git a/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
index 8f96cca..47cad4f 100644
--- a/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
+++ b/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java
@@ -235,6 +235,10 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
     public void clear() {
         super.clear();
         sqlSelect.toNull();
+        from.toNull();
+        selectColumns.clear();
+        ignoreColumns.clear();
+        subTable.clear();
     }
 
     @Override
@@ -243,7 +247,6 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
             MPJLambdaWrapper<?> apply = function.apply(instance(keyWord, clazz));
             onWrappers.add(apply);
             subTable.put(clazz, tableIndex);
-            TableInfo leftInfo = TableInfoHelper.getTableInfo(clazz);
             tableIndex++;
         }
         return typedThis;
diff --git a/src/main/java/com/github/yulichang/wrapper/interfaces/on/OnCompare.java b/src/main/java/com/github/yulichang/wrapper/interfaces/on/OnCompare.java
index 8d07b6d..8048a79 100644
--- a/src/main/java/com/github/yulichang/wrapper/interfaces/on/OnCompare.java
+++ b/src/main/java/com/github/yulichang/wrapper/interfaces/on/OnCompare.java
@@ -9,6 +9,8 @@ import java.io.Serializable;
  * 以及移除不会在ON语句中出现的条件 比如like相关 保留原来的like 只是不太可能会出现 on a.id like b.id 所以不会支持这种写法
  * <p>
  * {@link com.baomidou.mybatisplus.core.conditions.interfaces.Compare}
+ *
+ * @since 1.1.8
  */
 public interface OnCompare<Children> extends Serializable {
     /**
diff --git a/src/main/java/com/github/yulichang/wrapper/interfaces/on/OnFunction.java b/src/main/java/com/github/yulichang/wrapper/interfaces/on/OnFunction.java
index 6b7d18c..9cdb25c 100644
--- a/src/main/java/com/github/yulichang/wrapper/interfaces/on/OnFunction.java
+++ b/src/main/java/com/github/yulichang/wrapper/interfaces/on/OnFunction.java
@@ -2,6 +2,12 @@ package com.github.yulichang.wrapper.interfaces.on;
 
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 
+/**
+ * on function
+ *
+ * @author yulichang
+ * @since 1.1.8
+ */
 @FunctionalInterface
 public interface OnFunction {