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

Merge pull request #610 from cybzzz/main

Browse Source 
fix: 带子查询的场景下，分页优化误删 join 的修复
This commit is contained in:
Michael Yang 2025-11-16 13:49:59 +08:00 committed by GitHub
commit de26c7a668
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/OperatorSelectCondition.java
View File

@ -76,7 +76,8 @@ public class OperatorSelectCondition extends QueryCondition {
@Override @Override
boolean containsTable(String... tables) { boolean containsTable(String... tables) {
QueryCondition condition = queryWrapper.getWhereQueryCondition(); QueryCondition condition = queryWrapper.getWhereQueryCondition();
return condition != null && condition.containsTable(tables); boolean subContains = condition != null && condition.containsTable(tables);
return subContains || nextContainsTable(tables);
} }
@Override @Override

28
mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/common/QueryWrapperTest.java
View File

@ -31,11 +31,7 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import static com.mybatisflex.core.query.QueryMethods.case_; import static com.mybatisflex.core.query.QueryMethods.*;
import static com.mybatisflex.core.query.QueryMethods.column;
import static com.mybatisflex.core.query.QueryMethods.count;
import static com.mybatisflex.core.query.QueryMethods.distinct;
import static com.mybatisflex.core.query.QueryMethods.select;
import static com.mybatisflex.test.model.table.RoleTableDef.ROLE; import static com.mybatisflex.test.model.table.RoleTableDef.ROLE;
import static com.mybatisflex.test.model.table.UserRoleTableDef.USER_ROLE; import static com.mybatisflex.test.model.table.UserRoleTableDef.USER_ROLE;
import static com.mybatisflex.test.model.table.UserTableDef.USER; import static com.mybatisflex.test.model.table.UserTableDef.USER;
@ -199,4 +195,26 @@ class QueryWrapperTest {
" AND ` user_name ` = ''", sql); " AND ` user_name ` = ''", sql);
} }
@Test
void test07() {
QueryWrapper queryWrapper = QueryWrapper.create()
.select()
.from(USER.as("u"))
.leftJoin(USER_ROLE).as("ur").on(USER.USER_ID.eq(USER_ROLE.USER_ID))
.where(QueryCondition.createEmpty())
.and(USER.USER_ID.eq(1).or(USER.USER_ID.in(
QueryWrapper.create().select(USER_ROLE.USER_ID).from(USER_ROLE)))
)
.and(
exists(selectOne().from(ROLE)
.where(ROLE.ROLE_ID.eq(USER_ROLE.ROLE_ID)))
)
.and(USER_ROLE.USER_ID.eq(1));
System.out.println(queryWrapper.toSQL());
QueryCondition whereQueryCondition = CPI.getWhereQueryCondition(queryWrapper);
boolean contained = CPI.containsTable(whereQueryCondition, "tb_user_role");
Assertions.assertTrue(contained);
}
} }