wrapper 优化

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/AbstractWrapper.java

@@ -282,11 +282,21 @@ public abstract class AbstractWrapper<T, R, Children extends AbstractWrapper<T,
         return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), IN, inExpression(coll)));
     }
 
+    @Override
+    public Children in(boolean condition, R column, Object... values) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), IN, inExpression(values)));
+    }
+
     @Override
     public Children notIn(boolean condition, R column, Collection<?> coll) {
         return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), NOT_IN, inExpression(coll)));
     }
 
+    @Override
+    public Children notIn(boolean condition, R column, Object... values) {
+        return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), NOT_IN, inExpression(values)));
+    }
+
     @Override
     public Children inSql(boolean condition, R column, String inValue) {
         return maybeDo(condition, () -> appendSqlSegments(columnToSqlSegment(column), IN,
@@ -456,6 +466,19 @@ public abstract class AbstractWrapper<T, R, Children extends AbstractWrapper<T,
             .collect(joining(StringPool.COMMA, StringPool.LEFT_BRACKET, StringPool.RIGHT_BRACKET));
     }
 
+    /**
+     * 获取in表达式 包含括号
+     *
+     * @param values 数组
+     */
+    protected ISqlSegment inExpression(Object[] values) {
+        if (ArrayUtils.isEmpty(values)) {
+            return () -> "()";
+        }
+        return () -> Arrays.stream(values).map(i -> formatParam(null, i))
+            .collect(joining(StringPool.COMMA, StringPool.LEFT_BRACKET, StringPool.RIGHT_BRACKET));
+    }
+
     /**
      * 必要的初始化
      */

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/interfaces/Func.java

@@ -16,13 +16,9 @@
 package com.baomidou.mybatisplus.core.conditions.interfaces;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.Optional;
 import java.util.function.Consumer;
 
-import static java.util.stream.Collectors.toList;
-
 /**
  * 查询条件封装
  *
@@ -104,10 +100,7 @@ public interface Func<Children, R> extends Serializable {
      * @param values    数据数组
      * @return children
      */
-    default Children in(boolean condition, R column, Object... values) {
-        return in(condition, column, Arrays.stream(Optional.ofNullable(values).orElseGet(() -> new Object[]{}))
-            .collect(toList()));
-    }
+    Children in(boolean condition, R column, Object... values);
 
     /**
      * ignore
@@ -143,10 +136,7 @@ public interface Func<Children, R> extends Serializable {
      * @param values    数据数组
      * @return children
      */
-    default Children notIn(boolean condition, R column, Object... values) {
-        return notIn(condition, column, Arrays.stream(Optional.ofNullable(values).orElseGet(() -> new Object[]{}))
-            .collect(toList()));
-    }
+    Children notIn(boolean condition, R column, Object... values);
 
     /**
      * ignore

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/Query.java

@@ -27,10 +27,7 @@ import java.util.function.Predicate;
 public interface Query<Children, T, R> extends Serializable {
 
     /**
-     * 设置查询字段
-     *
-     * @param columns 字段数组
-     * @return children
+     * ignore
      */
     @SuppressWarnings("unchecked")
     Children select(R... columns);

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/conditions/QueryWrapperTest.java

@@ -157,7 +157,7 @@ class QueryWrapperTest extends BaseWrapperTest {
             .orderByAsc("id").orderByDesc("name", "name2")
             .groupBy("id").groupBy("name", "id2", "name2")
             .in("inColl", getList()).or().notIn("notInColl", getList())
-            .in("inArray").notIn("notInArray", 1, 2, 3)
+            .in("inArray").notIn("notInArray", 5, 6, 7)
             .inSql("inSql", "1,2,3,4,5").notInSql("inSql", "1,2,3,4,5")
             .having("sum(age) > {0}", 1).having("id is not null");
         logSqlSegment("测试 Func 下的方法", queryWrapper, "(nullColumn IS NULL OR notNullColumn IS NOT NULL AND inColl IN (?,?) OR notInColl NOT IN (?,?) AND inArray IN () AND notInArray NOT IN (?,?,?) AND inSql IN (1,2,3,4,5) AND inSql NOT IN (1,2,3,4,5)) GROUP BY id,name,id2,name2 HAVING sum(age) > ? AND id is not null ORDER BY id ASC,name DESC,name2 DESC");

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/conditions/AbstractChainWrapper.java

@@ -169,12 +169,24 @@ public abstract class AbstractChainWrapper<T, R, Children extends AbstractChainW
         return typedThis;
     }
 
+    @Override
+    public Children in(boolean condition, R column, Object... values) {
+        getWrapper().in(condition, column, values);
+        return typedThis;
+    }
+
     @Override
     public Children notIn(boolean condition, R column, Collection<?> coll) {
         getWrapper().notIn(condition, column, coll);
         return typedThis;
     }
 
+    @Override
+    public Children notIn(boolean condition, R column, Object... values) {
+        getWrapper().notIn(condition, column, values);
+        return typedThis;
+    }
+
     @Override
     public Children inSql(boolean condition, R column, String inValue) {
         getWrapper().inSql(condition, column, inValue);