Forráskód Böngészése

优化一下方法

miemie 7 éve
szülő
commit
3aed2d91ac

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

@@ -42,7 +42,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -56,7 +55,6 @@ import com.baomidou.mybatisplus.core.conditions.interfaces.Nested;
 import com.baomidou.mybatisplus.core.enums.SqlKeyword;
 import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 
 
@@ -107,15 +105,12 @@ public abstract class AbstractWrapper<T, R, This extends AbstractWrapper<T, R, T
 
     @Override
     public This allEq(boolean condition, Map<R, Object> params) {
-        if (condition && ObjectUtils.isNotEmpty(params)) {
-            Iterator iterator = params.entrySet().iterator();
-            while (iterator.hasNext()) {
-                Map.Entry<R, Object> entry = (Map.Entry<R, Object>) iterator.next();
-                Object value = entry.getValue();
-                if (StringUtils.checkValNotNull(value)) {
-                    and().eq(entry.getKey(), value);
+        if (condition && CollectionUtils.isNotEmpty(params)) {
+            params.forEach((k, v) -> {
+                if (StringUtils.checkValNotNull(v)) {
+                    and().eq(k, v);
                 }
-            }
+            });
         }
         return typedThis;
     }

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

@@ -30,6 +30,7 @@ import java.util.stream.Collectors;
  * @author hubin miemie HCL
  * @since 2017-05-26
  */
+@SuppressWarnings("unchecked")
 public interface Func<This, R> extends Serializable {
 
     /**
@@ -118,7 +119,6 @@ public interface Func<This, R> extends Serializable {
      * @param columns 分组字段【可多个】
      * @return
      */
-    @SuppressWarnings("all")
     default This groupBy(R... columns) {
         return groupBy(true, columns);
     }
@@ -132,13 +132,11 @@ public interface Func<This, R> extends Serializable {
      * @param columns   分组字段【可多个】
      * @return
      */
-    @SuppressWarnings("all")
     This groupBy(boolean condition, R... columns);
 
     /**
      * 排序:ORDER BY 字段, ...
      */
-    @SuppressWarnings("all")
     default This orderByAsc(R... columns) {
         return orderByAsc(true, columns);
     }
@@ -152,7 +150,6 @@ public interface Func<This, R> extends Serializable {
      * @param columns   排序字段【可多个】
      * @return
      */
-    @SuppressWarnings("all")
     default This orderByAsc(boolean condition, R... columns) {
         return orderBy(condition, true, columns);
     }
@@ -160,7 +157,6 @@ public interface Func<This, R> extends Serializable {
     /**
      * 排序:ORDER BY 字段, ...
      */
-    @SuppressWarnings("all")
     default This orderByDesc(R... columns) {
         return orderByDesc(true, columns);
     }
@@ -174,7 +170,6 @@ public interface Func<This, R> extends Serializable {
      * @param columns   排序字段【可多个】
      * @return
      */
-    @SuppressWarnings("all")
     default This orderByDesc(boolean condition, R... columns) {
         return orderBy(condition, false, columns);
     }
@@ -182,7 +177,6 @@ public interface Func<This, R> extends Serializable {
     /**
      * 排序:ORDER BY 字段, ...
      */
-    @SuppressWarnings("all")
     This orderBy(boolean condition, boolean isAsc, R... columns);
 
     /**