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

close #I6VPFJ

Browse Source
This commit is contained in:
开源海哥 2023-04-14 15:03:28 +08:00
parent 8daaa330b4
commit f4cbf0c396
2 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
View File

@ -352,7 +352,14 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
Object[] getValueArray() { Object[] getValueArray() {
Object[] whereValues = WrapperUtil.getValues(whereQueryCondition); Object[] whereValues = WrapperUtil.getValues(whereQueryCondition);
Object[] havingValues = WrapperUtil.getValues(havingQueryCondition); Object[] havingValues = WrapperUtil.getValues(havingQueryCondition);
return ArrayUtil.concat(whereValues, havingValues); Object[] values = ArrayUtil.concat(whereValues, havingValues);
if (CollectionUtil.isNotEmpty(unions)) {
for (UnionWrapper union : unions) {
QueryWrapper queryWrapper = union.getQueryWrapper();
values = ArrayUtil.concat(values, queryWrapper.getValueArray());
}
}
return values;
} }

71
mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/TenantTester.java
View File

@ -18,6 +18,7 @@ package com.mybatisflex.test;
import com.mybatisflex.core.MybatisFlexBootstrap; import com.mybatisflex.core.MybatisFlexBootstrap;
import com.mybatisflex.core.audit.AuditManager; import com.mybatisflex.core.audit.AuditManager;
import com.mybatisflex.core.audit.ConsoleMessageCollector; import com.mybatisflex.core.audit.ConsoleMessageCollector;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.tenant.TenantFactory; import com.mybatisflex.core.tenant.TenantFactory;
import com.mybatisflex.core.tenant.TenantManager; import com.mybatisflex.core.tenant.TenantManager;
import com.mybatisflex.mapper.TenantAccountMapper; import com.mybatisflex.mapper.TenantAccountMapper;
@ -25,8 +26,8 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.util.List;
import static com.mybatisflex.test.table.Tables.ACCOUNT;
import static com.mybatisflex.test.table.Tables.TENANT_ACCOUNT; import static com.mybatisflex.test.table.Tables.TENANT_ACCOUNT;
public class TenantTester { public class TenantTester {
@ -59,38 +60,42 @@ public class TenantTester {
TenantAccountMapper mapper = MybatisFlexBootstrap.getInstance().getMapper(TenantAccountMapper.class); TenantAccountMapper mapper = MybatisFlexBootstrap.getInstance().getMapper(TenantAccountMapper.class);
// mapper.selectListByQuery(QueryWrapper.create() mapper.selectListByQuery(QueryWrapper.create()
// .select(TENANT_ACCOUNT.ALL_COLUMNS) .select(TENANT_ACCOUNT.ALL_COLUMNS)
// .from(TENANT_ACCOUNT.as("a"), TENANT_ACCOUNT1.as("b")) .from(TENANT_ACCOUNT.as("a"), ACCOUNT.as("b"))
// .where(TENANT_ACCOUNT.ID.eq(TENANT_ACCOUNT1.ID)) .where(TENANT_ACCOUNT.ID.eq(ACCOUNT.ID))
// .and(TENANT_ACCOUNT.ID.eq(1)) .and(TENANT_ACCOUNT.ID.eq(1))
// ); .unionAll(QueryWrapper.create()
.select(TENANT_ACCOUNT.ALL_COLUMNS).from(TENANT_ACCOUNT)
.where(TENANT_ACCOUNT.ID.eq(2))
)
);
//
//SELECT * FROM `tb_account` WHERE `tenant_id` = 1 // //SELECT * FROM `tb_account` WHERE `tenant_id` = 1
List<TenantAccount> tenantAccounts = mapper.selectAll(); // List<TenantAccount> tenantAccounts = mapper.selectAll();
System.out.println(tenantAccounts); // System.out.println(tenantAccounts);
//
//SELECT * FROM `tb_account` WHERE `id` = 1 AND `tenant_id` IN (1) // //SELECT * FROM `tb_account` WHERE `id` = 1 AND `tenant_id` IN (1)
TenantAccount tenantAccount1 = mapper.selectOneById(1); // TenantAccount tenantAccount1 = mapper.selectOneById(1);
System.out.println(tenantAccount1); // System.out.println(tenantAccount1);
//
//SELECT * FROM `tb_account` WHERE `id` = 2 AND `tenant_id` IN (1) // //SELECT * FROM `tb_account` WHERE `id` = 2 AND `tenant_id` IN (1)
TenantAccount tenantAccount2 = mapper.selectOneById(2); // TenantAccount tenantAccount2 = mapper.selectOneById(2);
System.out.println(tenantAccount2); // System.out.println(tenantAccount2);
//
//DELETE FROM `tb_account` WHERE `id` >= 100 AND `tenant_id` = 1 // //DELETE FROM `tb_account` WHERE `id` >= 100 AND `tenant_id` = 1
mapper.deleteByCondition(TENANT_ACCOUNT.ID.ge(100)); // mapper.deleteByCondition(TENANT_ACCOUNT.ID.ge(100));
//
// UPDATE `tb_account` SET `age` = 10 WHERE `id` >= 100 AND `tenant_id` = 1 // // UPDATE `tb_account` SET `age` = 10 WHERE `id` >= 100 AND `tenant_id` = 1
TenantAccount updateAccount = new TenantAccount(); // TenantAccount updateAccount = new TenantAccount();
updateAccount.setAge(10); // updateAccount.setAge(10);
mapper.updateByCondition(updateAccount,TENANT_ACCOUNT.ID.ge(100)); // mapper.updateByCondition(updateAccount,TENANT_ACCOUNT.ID.ge(100));
//
//SELECT * FROM `tb_account` WHERE `id` >= 100 AND `tenant_id` = 1 LIMIT 1 // //SELECT * FROM `tb_account` WHERE `id` >= 100 AND `tenant_id` = 1 LIMIT 1
mapper.selectOneByCondition(TENANT_ACCOUNT.ID.ge(100)); // mapper.selectOneByCondition(TENANT_ACCOUNT.ID.ge(100));
//
//SELECT * FROM `tb_account` WHERE `id` >= 100 AND `tenant_id` = 1 LIMIT 10 // //SELECT * FROM `tb_account` WHERE `id` >= 100 AND `tenant_id` = 1 LIMIT 10
mapper.selectListByCondition(TENANT_ACCOUNT.ID.ge(100),10); // mapper.selectListByCondition(TENANT_ACCOUNT.ID.ge(100),10);
} }
} }