From 473ec1d052c4c7fa5c7054745f2de40f980e45ef Mon Sep 17 00:00:00 2001
From: yulichang <570810310@qq.com>
Date: Tue, 6 Jun 2023 01:02:05 +0800
Subject: [PATCH] fix
 https://gitee.com/best_handsome/mybatis-plus-join/issues/I7A3N8

---
 .../github/yulichang/kt/KtAbstractLambdaWrapper.java   | 10 +++-------
 .../yulichang/wrapper/MPJAbstractLambdaWrapper.java    | 10 +++-------
 .../com/github/yulichang/wrapper/MPJLambdaWrapper.java |  3 ++-
 3 files changed, 8 insertions(+), 15 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 5e7225f..9cf1284 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,8 +17,8 @@ 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;
 import java.util.HashMap;
 import java.util.Map;
@@ -204,11 +204,7 @@ public abstract class KtAbstractLambdaWrapper<T, Children extends KtAbstractLamb
             }
         }
         String decode;
-        try {
-            decode = URLDecoder.decode(tableName, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            decode = tableName;
-        }
+        decode = URLDecoder.decode(tableName, StandardCharsets.UTF_8);
         if (dynamicTableName) {
             return tableFunc.apply(decode);
         }
@@ -334,7 +330,7 @@ public abstract class KtAbstractLambdaWrapper<T, Children extends KtAbstractLamb
             StringBuilder value = new StringBuilder();
             for (Children wrapper : onWrappers) {
                 if (StringUtils.isBlank(wrapper.from.getStringValue())) {
-                    if (wrapper.subLogicSql && this.logicDelType == LogicDelTypeEnum.ON) {
+                    if (this.subLogicSql && this.logicDelType == LogicDelTypeEnum.ON) {
                         TableInfo tableInfo = TableHelper.get(wrapper.getJoinClass());
                         if (ConfigProperties.tableInfoAdapter.mpjHasLogic(tableInfo)) {
                             wrapper.appendSqlSegments(APPLY, () -> LogicInfoUtils.getLogicInfoNoAnd(
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 1645e9c..60dff6b 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,8 +17,8 @@ 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;
 import java.util.HashMap;
 import java.util.Map;
@@ -204,11 +204,7 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
             }
         }
         String decode;
-        try {
-            decode = URLDecoder.decode(tableName, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            decode = tableName;
-        }
+        decode = URLDecoder.decode(tableName, StandardCharsets.UTF_8);
         if (dynamicTableName) {
             return tableFunc.apply(decode);
         }
@@ -335,7 +331,7 @@ public abstract class MPJAbstractLambdaWrapper<T, Children extends MPJAbstractLa
             StringBuilder value = new StringBuilder();
             for (Children wrapper : onWrappers) {
                 if (StringUtils.isBlank(wrapper.from.getStringValue())) {
-                    if (wrapper.subLogicSql && this.logicDelType == LogicDelTypeEnum.ON) {
+                    if (this.subLogicSql && this.logicDelType == LogicDelTypeEnum.ON) {
                         TableInfo tableInfo = TableHelper.get(wrapper.getJoinClass());
                         if (ConfigProperties.tableInfoAdapter.mpjHasLogic(tableInfo)) {
                             wrapper.appendSqlSegments(APPLY, () -> LogicInfoUtils.getLogicInfoNoAnd(
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 d0c8eba..9146b0e 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<E>(null, clazz, SharedString.emptyString(), paramNameSeq, paramNameValuePairs,
+        MPJLambdaWrapper<E> wrapper = new MPJLambdaWrapper<>(null, clazz, SharedString.emptyString(), paramNameSeq, paramNameValuePairs,
                 new MergeSegments(), SharedString.emptyString(), SharedString.emptyString(), SharedString.emptyString(),
                 new TableList(), null, null, null, null) {
         };
@@ -251,6 +251,7 @@ 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 -> {