소스 검색

增加方法断言.

聂秋荣 7 년 전
부모
커밋
9df1faccc6

+ 10 - 8
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/LambdaQueryWrapper.java

@@ -99,22 +99,24 @@ public class LambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, LambdaQueryW
      * @param excludeColumns 排除的查询字段
      */
     @SafeVarargs
-    public final LambdaQueryWrapper<T> excludeColumns(Class<T> clazz, Property<T, ?>... excludeColumns) {
-        this.entityClass = clazz;
+    public final LambdaQueryWrapper<T> excludeColumns(Class<?> entityClass, Property<T, ?>... excludeColumns) {
+        Assert.notNull(entityClass,"entityClass is not null");
+        Assert.notEmpty(excludeColumns,"excludeColumns is not null");
+        this.entityClass = entityClass;
         for (Property<T, ?> column : excludeColumns) {
             excludeColumn.add(this.columnToString(column));
         }
         return typedThis;
     }
     
+    /**
+     * 排除字段
+     * @param excludeColumns 排除字段列表
+     */
     @SafeVarargs
     public final LambdaQueryWrapper<T> excludeColumns(Property<T, ?>... excludeColumns) {
-        Assert.notNull(entity,"entity not null");
-        this.entityClass = entity.getClass();
-        for (Property<T, ?> column : excludeColumns) {
-            excludeColumn.add(this.columnToString(column));
-        }
-        return typedThis;
+        Assert.notNull(entity,"entity is not null");
+        return excludeColumns(entity.getClass(),excludeColumns);
     }
 
     @Override

+ 16 - 7
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/QueryWrapper.java

@@ -96,18 +96,27 @@ public class QueryWrapper<T> extends AbstractWrapper<T, String, QueryWrapper<T>>
         }
         return typedThis;
     }
-
-    public QueryWrapper<T> excludeColumns(Class<?> clazz,String... excludeColumns) {
+    
+    /**
+     * 排除字段
+     * @param entityClass 实体类
+     * @param excludeColumns 排除字段列表
+     */
+    public QueryWrapper<T> excludeColumns(Class<?> entityClass,String... excludeColumns) {
+        Assert.notNull(entityClass,"entityClass is not null");
+        Assert.notEmpty(excludeColumns,"excludeColumns is not null");
         this.excludeColumns = excludeColumns;
-        this.entityClass = clazz;
+        this.entityClass = entityClass;
         return typedThis;
     }
     
+    /**
+     * 排除字段
+     * @param excludeColumns 排除字段列表
+     */
     public QueryWrapper<T> excludeColumns(String... excludeColumns) {
-        this.excludeColumns = excludeColumns;
-        Assert.notNull(entity,"entity not null");
-        this.entityClass = entity.getClass();
-        return typedThis;
+        Assert.notNull(entity,"entity is not null");
+        return excludeColumns(entity.getClass(),excludeColumns);
     }
 
     /**

+ 9 - 0
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/Assert.java

@@ -90,4 +90,13 @@ public final class Assert {
     public static void notEmpty(Map<?, ?> map, String message) {
         isTrue(CollectionUtils.isNotEmpty(map), message);
     }
+    
+    /**
+     * 断言数组不能为空
+     * @param array 数组
+     * @param message 消息
+     */
+    public static void notEmpty(Object[] array, String message) {
+        isTrue(ArrayUtils.isNotEmpty(array), message);
+    }
 }