[release] release v2.0.0-alpha+001

dromara · Aug 9, 2023 · 91337e4 · 91337e4
1 parent dbe60ed
commit 91337e4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
-        <revision>1.9.1</revision>
+        <revision>2.0.0-alpha+001</revision>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version>

diff --git a/stream-dependencies/pom.xml b/stream-dependencies/pom.xml
@@ -56,7 +56,7 @@
     </developers>
 
     <properties>
-        <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
+        <mybatis-plus.version>3.5.3.2</mybatis-plus.version>
         <byte-buddy.version>1.12.21</byte-buddy.version>
         <lombok.version>1.18.24</lombok.version>
         <spring-boot.version>2.7.0</spring-boot.version>

diff --git a/...plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/BaseQueryHelper.java b/...plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/BaseQueryHelper.java
@@ -18,6 +18,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import org.dromara.streamquery.stream.core.collection.Lists;
 import org.dromara.streamquery.stream.core.lambda.function.SerCons;
 import org.dromara.streamquery.stream.core.lambda.function.SerFunc;
 import org.dromara.streamquery.stream.core.optional.Sf;
@@ -153,7 +154,8 @@ public S peek(SerCons<T> peek) {
    */
   protected <R> void attachSingle(SFunction<T, R> valueFunction) {
     this.valueFunction = (SFunction<T, V>) valueFunction;
-    WrapperHelper.select(wrapper, (w, col) -> w.select(col[1]), keyFunction, valueFunction);
+    WrapperHelper.select(
+        wrapper, (w, col) -> w.select(Lists.of(col[1])), keyFunction, valueFunction);
   }
 
   /**

diff --git a/...s-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/WrapperHelper.java b/...s-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/WrapperHelper.java
@@ -37,7 +37,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.BiConsumer;
-import java.util.stream.Stream;
 
 /**
  * @author VampireAchao
@@ -125,7 +124,7 @@ public static <T> LambdaQueryWrapper<T> multiIn(LambdaQueryWrapper<T> wrapper, L
   @SafeVarargs
   public static <T> LambdaQueryWrapper<T> select(
       LambdaQueryWrapper<T> wrapper, SFunction<T, ?>... columns) {
-    return select(wrapper, LambdaQueryWrapper::select, columns);
+    return select(wrapper, (w, cols) -> w.select(Lists.of(cols)), columns);
   }
 
   /**
@@ -143,7 +142,7 @@ public static <T> LambdaQueryWrapper<T> select(
       LambdaQueryWrapper<T> wrapper,
       SerBiCons<LambdaQueryWrapper<T>, SFunction<T, ?>[]> whenAllMatchColumn,
       SFunction<T, ?>... columns) {
-    if (Stream.of(columns)
+    if (Steam.of(columns)
         .allMatch(
             func ->
                 Objects.nonNull(func)