From 05191f49b2b44a0e5ddac2b14a612d1d69dd4fad Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Sat, 15 Jul 2023 11:40:43 +0800
Subject: [PATCH] fix https://github.com/yulichang/mybatis-plus-join/issues/65

---
 .../com/github/yulichang/kt/KtAbstractLambdaWrapper.java   | 7 ++++++-
 .../github/yulichang/wrapper/MPJAbstractLambdaWrapper.java | 7 ++++++-
 .../com/github/yulichang/wrapper/MPJLambdaWrapper.java     | 2 +-
 3 files changed, 13 insertions(+), 3 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 9cf1284..b1a6ad8 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
@@ -17,6 +17,7 @@ import com.github.yulichang.wrapper.segments.SelectCache;
 import kotlin.reflect.KProperty;
 import lombok.Getter;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -204,7 +205,11 @@ public abstract class KtAbstractLambdaWrapper<T, Children extends KtAbstractLamb
             }
         }
         String decode;
-        decode = URLDecoder.decode(tableName, StandardCharsets.UTF_8);
+        try {
+            decode = URLDecoder.decode(tableName, StandardCharsets.UTF_8.name());
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
         if (dynamicTableName) {
             return tableFunc.apply(decode);
         }
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 60dff6b..d1d2c69 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
@@ -17,6 +17,7 @@ import com.github.yulichang.wrapper.interfaces.QueryJoin;
 import com.github.yulichang.wrapper.segments.SelectCache;
 import lombok.Getter;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -204,7 +205,11 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
             }
         }
         String decode;
-        decode = URLDecoder.decode(tableName, StandardCharsets.UTF_8);
+        try {
+            decode = URLDecoder.decode(tableName, StandardCharsets.UTF_8.name());
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
         if (dynamicTableName) {
             return tableFunc.apply(decode);
         }
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 9146b0e..9873474 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
@@ -194,7 +194,7 @@ public class MPJLambdaWrapper<T> extends MPJAbstractLambdaWrapper<T, MPJLambdaWr
      * 子查询
      */
     public <E, F> MPJLambdaWrapper<T> selectSub(Class<E> clazz, String st, Consumer<MPJLambdaWrapper<E>> consumer, SFunction<F, ?> alias) {
-        MPJLambdaWrapper<E> wrapper = new MPJLambdaWrapper<>(null, clazz, SharedString.emptyString(), paramNameSeq, paramNameValuePairs,
+        MPJLambdaWrapper<E> wrapper = new MPJLambdaWrapper<E>(null, clazz, SharedString.emptyString(), paramNameSeq, paramNameValuePairs,
                 new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
                 new TableList(), null, null, null, null) {
         };