admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 09:08:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: QueryWrapperAdapter.java

Browse Source
This commit is contained in:
开源海哥 2023-07-22 14:45:44 +08:00
parent 833d4a7664
commit d0a2b02862
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java
View File

@ -173,8 +173,8 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
}
@Override
public QueryConditionBuilder<R> and(LambdaGetter fn) {
return super.and(fn);
public <T> QueryConditionBuilder<R> and(LambdaGetter<T> fn) {
return new QueryConditionBuilder<>((R) this, LambdaUtil.getQueryColumn(fn), SqlConnector.AND);
}
@Override
@ -196,8 +196,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
}
@Override
public QueryWrapper and(Map<String, Object> whereConditions, Map<String, SqlOperator> operators, SqlConnector innerConnector) {
return super.and(whereConditions, operators, innerConnector);
public R and(Map<String, Object> whereConditions, Map<String, SqlOperator> operators, SqlConnector innerConnector) {
super.and(whereConditions, operators, innerConnector);
return (R) this;
}
@Override
@ -219,8 +220,8 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
}
@Override
public QueryConditionBuilder<R> or(LambdaGetter fn) {
return super.or(fn);
public <T> QueryConditionBuilder<R> or(LambdaGetter<T> fn) {
return new QueryConditionBuilder<>((R) this, LambdaUtil.getQueryColumn(fn), SqlConnector.OR);
}
@Override
@ -242,8 +243,9 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
}
@Override
public QueryWrapper or(Map<String, Object> whereConditions, Map<String, SqlOperator> operators, SqlConnector innerConnector) {
return super.or(whereConditions, operators, innerConnector);
public R or(Map<String, Object> whereConditions, Map<String, SqlOperator> operators, SqlConnector innerConnector) {
super.or(whereConditions, operators, innerConnector);
return (R) this;
}
@Override