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

!119 fix: 使用 Lambda 构建 in、notIn 时 QueryConditionBuilder 变量指向错误

Browse Source 
Merge pull request !119 from 王帅/main
This commit is contained in:
Michael Yang 2023-07-09 10:18:19 +00:00 committed by Gitee
commit fa766752de
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java
View File

@ -1,17 +1,17 @@
/**
* Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
* <p>
* 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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).
* <p>
* 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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 <T> QueryWrapper in(QueryWrapper queryWrapper, Predicate<T> 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 <T> QueryWrapper notIn(QueryWrapper queryWrapper, Predicate<T> when) {
if (queryWrapper != null) {
queryWrapper.addWhereQueryCondition(queryColumn.notIn(queryWrapper, when), connector);
this.queryWrapper.addWhereQueryCondition(queryColumn.notIn(queryWrapper, when), connector);
}
return queryWrapper;
return this.queryWrapper;
}

13
mybatis-flex-test/mybatis-flex-spring-test/src/test/java/com/mybatisflex/test/AccountTest.java
View File

@ -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());
}
}