修改集合

src/main/java/cn/flowbb/framework/mybatis/core/mapper/BaseMapperX.java

@@ -117,19 +117,19 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 	// ------selectOne查询从一个条件到三个条件---end--------------------------------------------
 
 	// 查询in得集合----------------start---------------------------------------
-	default List<T> selectIn(String field, Object value) {
+	default List<T> selectIn(String field, Collection<?> value) {
 		return selectList(new QueryWrapper<T>().in(field, value));
 	}
 
-	default List<T> selectIn(SFunction<T, ?> field, Object value) {
+	default List<T> selectIn(SFunction<T, ?> field, Collection<?> value) {
 		return selectList(new LambdaQueryWrapper<T>().in(field, value));
 	}
 
-	default List<T> selectIn(String field1, Object value1, String field2, Object value2) {
+	default List<T> selectIn(String field1, Collection<?> value1, String field2, Collection<?> value2) {
 		return selectList(new QueryWrapper<T>().in(field1, value1).in(field2, value2));
 	}
 
-	default List<T> selectIn(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
+	default List<T> selectIn(SFunction<T, ?> field1, Collection<?> value1, SFunction<T, ?> field2, Collection<?> value2) {
 		return selectList(new LambdaQueryWrapper<T>().in(field1, value1).in(field2, value2));
 	}
 
@@ -178,28 +178,7 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return selectList(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, values));
 	}
 
-	// 查询集合得
-	default List<T> selectList(String field, Collection<?> values) {
-		if (CollUtil.isEmpty(values)) {
-			return CollUtil.newArrayList();
-		}
-		return selectList(new QueryWrapper<T>().in(field, values));
-	}
-
-	default List<T> selectList(SFunction<T, ?> field, Collection<?> values) {
-		if (CollUtil.isEmpty(values)) {
-			return CollUtil.newArrayList();
-		}
-		return selectList(new LambdaQueryWrapper<T>().in(field, values));
-	}
-
-	default List<T> selectList(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Collection<?> values) {
-		return selectList(new LambdaQueryWrapper<T>().eq(field1, value1).in(field2, values));
-	}
-
-	default List<T> selectList(String field1, Object value1, String field2, Collection<?> values) {
-		return selectList(new QueryWrapper<T>().eq(field1, value1).in(field2, values));
-	}
+	
 	// 查询selectList----------------end----------------------
 
 	// 删除条件-----------------------start--------------------------------

src/main/java/cn/flowbb/framework/mybatis/core/service/AbstractService.java

@@ -236,20 +236,20 @@ public interface AbstractService<T> extends MPJBaseService<T> {
 	// 查询selectList----------------end----------------------
 
 	// 查询in得集合----------------start---------------------------------------
-	default List<T> in(String field, Object value) {
+	default List<T> in(String field, Collection<?> value) {
 		return getBaseMapper().selectIn(field, value);
 	}
 
-	default List<T> in(SFunction<T, ?> field, Object value) {
-		return getBaseMapper().selectList(field, value);
+	default List<T> in(SFunction<T, ?> field, Collection<?> value) {
+		return getBaseMapper().selectIn(field, value);
 	}
 
-	default List<T> in(String field1, Object value1, String field2, Object value2) {
-		return getBaseMapper().selectList(field1, value1, field2, value2);
+	default List<T> in(String field1, Collection<?> value1, String field2, Collection<?> value2) {
+		return getBaseMapper().selectIn(field1, value1, field2, value2);
 	}
 
-	default List<T> in(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
-		return getBaseMapper().selectList(field1, value1, field2, value2);
+	default List<T> in(SFunction<T, ?> field1, Collection<?> value1, SFunction<T, ?> field2, Collection<?> value2) {
+		return getBaseMapper().selectIn(field1, value1, field2, value2);
 	}
 
 	// 查询in得集合----------------end---------------------------------------