From d0a2b0286275a28415ad3f53b9529575e9780081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Sat, 22 Jul 2023 14:45:44 +0800
Subject: [PATCH] fix: QueryWrapperAdapter.java

---
 .../core/query/QueryWrapperAdapter.java        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java
index 84edc89c..be65de1d 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java
@@ -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