修改查询

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

@@ -137,6 +137,10 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return selectList(new LambdaQueryWrapper<T>().eq(field, value));
 	}
 
+	default List<T> selectList(String field1, Object value1, String field2, Object value2) {
+		return selectList(new QueryWrapper<T>().eq(field1, value1).eq(field2, value2));
+	}
+
 	default List<T> selectList(String field, Collection<?> values) {
 		if (CollUtil.isEmpty(values)) {
 			return CollUtil.newArrayList();
@@ -151,11 +155,6 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return selectList(new LambdaQueryWrapper<T>().in(field, values));
 	}
 
-	@Deprecated
-	default List<T> selectList(SFunction<T, ?> leField, SFunction<T, ?> geField, Object value) {
-		return selectList(new LambdaQueryWrapper<T>().le(leField, value).ge(geField, value));
-	}
-
 	default List<T> selectList(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
 		return selectList(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2));
 	}

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

@@ -14,6 +14,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 
 import cn.flowbb.framework.mybatis.core.mapper.PlusBaseMapperX;
 import cn.flowbb.framework.mybatis.core.mapper.QueryWrapperUtil;
+import cn.hutool.core.collection.CollUtil;
 
 public interface AbstractService<T> extends MPJBaseService<T> {
 
@@ -120,6 +121,36 @@ public interface AbstractService<T> extends MPJBaseService<T> {
 		return getBaseMapper().selectList(t);
 	}
 
+	default List<T> list(String field, Object value) {
+		return getBaseMapper().selectList(new QueryWrapper<T>().eq(field, value));
+	}
+
+	default List<T> list(SFunction<T, ?> field, Object value) {
+		return getBaseMapper().selectList(new LambdaQueryWrapper<T>().eq(field, value));
+	}
+
+	default List<T> list(String field, Collection<?> values) {
+		if (CollUtil.isEmpty(values)) {
+			return CollUtil.newArrayList();
+		}
+		return getBaseMapper().selectList(new QueryWrapper<T>().in(field, values));
+	}
+
+	default List<T> list(SFunction<T, ?> field, Collection<?> values) {
+		if (CollUtil.isEmpty(values)) {
+			return CollUtil.newArrayList();
+		}
+		return getBaseMapper().selectList(new LambdaQueryWrapper<T>().in(field, values));
+	}
+
+	default List<T> list(String field, Object value, String field1, Object value2) {
+		return getBaseMapper().selectList(new QueryWrapper<T>().eq(field, value).eq(field, value));
+	}
+
+	default List<T> list(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
+		return getBaseMapper().selectList(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2));
+	}
+
 	/**
 	 * 查询列表
 	 *
@@ -150,8 +181,8 @@ public interface AbstractService<T> extends MPJBaseService<T> {
 	default <E extends IPage<T>> E page(E page, T t) {
 		return getBaseMapper().selectPage(page, t);
 	}
-	
-	//条件查询语句
+
+	// 查询得到一个结果得值
 	default T getOne(String field, Object value) {
 		return getBaseMapper().selectOne(new QueryWrapper<T>().eq(field, value));
 	}
@@ -168,11 +199,34 @@ public interface AbstractService<T> extends MPJBaseService<T> {
 		return getBaseMapper().selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2));
 	}
 
+	default T getOne(String field1, Object value1, String field2, Object value2, String field3, Object value3) {
+		return getBaseMapper()
+				.selectOne(new QueryWrapper<T>().eq(field1, value1).eq(field2, value2).eq(field3, value3));
+	}
+
 	default T getOne(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2,
 			SFunction<T, ?> field3, Object value3) {
-		return getBaseMapper().selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2).eq(field3, value3));
+		return getBaseMapper()
+				.selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2).eq(field3, value3));
+	}
+
+	// 查询in得集合
+	default List<T> in(String field, Object value) {
+		return getBaseMapper().selectList(field, value);
+	}
+
+	default List<T> in(SFunction<T, ?> field, Object value) {
+		return getBaseMapper().selectList(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(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
+		return getBaseMapper().selectList(new LambdaQueryWrapper<T>().in(field1, value1).in(field2, value2));
+	}
+
 	// select join
 	// 带参数得查询
 	/**
@@ -192,7 +246,6 @@ public interface AbstractService<T> extends MPJBaseService<T> {
 		return getBaseMapper().selectJoinCount(wrapper);
 	}
 
-
 	/**
 	 * 查询对象 连表查询返回记录集合
 	 *