From 27bf67dee063f932b3de462e2dea107e594e71a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= Date: Thu, 6 Apr 2023 19:01:15 +0800 Subject: [PATCH] optimize QueryWrapper.java --- .../com/mybatisflex/core/query/QueryWrapper.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java index 909bd8c1..ec5f6070 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java @@ -123,7 +123,6 @@ public class QueryWrapper extends BaseQueryWrapper { return this; } - public QueryWrapper and(QueryCondition queryCondition) { return addWhereQueryCondition(queryCondition, SqlConnector.AND); } @@ -133,17 +132,25 @@ public class QueryWrapper extends BaseQueryWrapper { return this; } - public QueryWrapper and(String sql, Object... params) { this.addWhereQueryCondition(new StringQueryCondition(sql, params), SqlConnector.AND); return this; } - public QueryWrapper or(QueryCondition queryCondition) { return addWhereQueryCondition(queryCondition, SqlConnector.OR); } + public QueryWrapper or(String sql) { + this.addWhereQueryCondition(new StringQueryCondition(sql), SqlConnector.OR); + return this; + } + + public QueryWrapper or(String sql, Object... params) { + this.addWhereQueryCondition(new StringQueryCondition(sql, params), SqlConnector.OR); + return this; + } + public Joiner leftJoin(String table) { return joining(Join.TYPE_LEFT, table, true);