From 7977f9d574693da0636299459638379255c9b512 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Sun, 9 Jul 2023 18:07:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=8F=98=E9=87=8F=E6=8C=87=E5=90=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/query/QueryConditionBuilder.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java index 0c300c5b..1d136c55 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java @@ -1,17 +1,17 @@ -/** - * Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com). - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. +/* + * Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com). + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.mybatisflex.core.query; @@ -318,16 +318,16 @@ public class QueryConditionBuilder { */ public QueryWrapper in(QueryWrapper queryWrapper) { if (queryWrapper != null) { - queryWrapper.addWhereQueryCondition(queryColumn.in(queryWrapper), connector); + this.queryWrapper.addWhereQueryCondition(queryColumn.in(queryWrapper), connector); } - return queryWrapper; + return this.queryWrapper; } public QueryWrapper in(QueryWrapper queryWrapper, Predicate when) { if (queryWrapper != null) { - queryWrapper.addWhereQueryCondition(queryColumn.in(queryWrapper, when), connector); + this.queryWrapper.addWhereQueryCondition(queryColumn.in(queryWrapper, when), connector); } - return queryWrapper; + return this.queryWrapper; } @@ -399,16 +399,16 @@ public class QueryConditionBuilder { */ public QueryWrapper notIn(QueryWrapper queryWrapper) { if (queryWrapper != null) { - queryWrapper.addWhereQueryCondition(queryColumn.notIn(queryWrapper), connector); + this.queryWrapper.addWhereQueryCondition(queryColumn.notIn(queryWrapper), connector); } - return queryWrapper; + return this.queryWrapper; } public QueryWrapper notIn(QueryWrapper queryWrapper, Predicate when) { if (queryWrapper != null) { - queryWrapper.addWhereQueryCondition(queryColumn.notIn(queryWrapper, when), connector); + this.queryWrapper.addWhereQueryCondition(queryColumn.notIn(queryWrapper, when), connector); } - return queryWrapper; + return this.queryWrapper; } From 10e605b507b870f8a3503f4acaf13aa5f48b99a7 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Sun, 9 Jul 2023 18:07:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?test:=20=E4=BD=BF=E7=94=A8=20lambda=20?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=20in=20=E6=9D=A1=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/com/mybatisflex/test/AccountTest.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mybatis-flex-test/mybatis-flex-spring-test/src/test/java/com/mybatisflex/test/AccountTest.java b/mybatis-flex-test/mybatis-flex-spring-test/src/test/java/com/mybatisflex/test/AccountTest.java index f7b1401d..8295ac2e 100644 --- a/mybatis-flex-test/mybatis-flex-spring-test/src/test/java/com/mybatisflex/test/AccountTest.java +++ b/mybatis-flex-test/mybatis-flex-spring-test/src/test/java/com/mybatisflex/test/AccountTest.java @@ -57,8 +57,19 @@ public class AccountTest implements WithAssertions { @Test public void testSelectOneByRow() { - Row row = Db.selectOneById(null,"tb_account", "id", 1); + Row row = Db.selectOneById(null, "tb_account", "id", 1); System.out.println(row); } + @Test + public void testLambda() { + QueryWrapper queryWrapper = QueryWrapper.create() + .select() + .from(ACCOUNT) + .where(Account::getAge).in( + QueryWrapper.create().select(ACCOUNT.AGE).from(ACCOUNT).where(ACCOUNT.AGE.ge(18)) + ); + System.out.println(queryWrapper.toSQL()); + } + }