From fdfbad3d0a9eb9c59ac236968b37f76efb793551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= Date: Sun, 16 Apr 2023 09:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8CdeleteBatchByIds=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E3=80=82close=20#I6W0I4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/provider/EntitySqlProvider.java | 3 ++- .../com/mybatisflex/test/TenantTester.java | 25 ++++++++----------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java index ef8fdfc8..7072b7ec 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java @@ -150,7 +150,8 @@ public class EntitySqlProvider { TableInfo tableInfo = ProviderUtil.getTableInfo(context); - ProviderUtil.setSqlArgs(params, primaryValues); + Object[] tenantIdArgs = tableInfo.buildTenantIdArgs(); + ProviderUtil.setSqlArgs(params, ArrayUtil.concat(primaryValues,tenantIdArgs)); return DialectFactory.getDialect().forDeleteEntityBatchByIds(tableInfo, primaryValues); } diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/TenantTester.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/TenantTester.java index 0c0ebfd7..470432ce 100644 --- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/TenantTester.java +++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/TenantTester.java @@ -18,7 +18,6 @@ package com.mybatisflex.test; import com.mybatisflex.core.MybatisFlexBootstrap; import com.mybatisflex.core.audit.AuditManager; import com.mybatisflex.core.audit.ConsoleMessageCollector; -import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.tenant.TenantFactory; import com.mybatisflex.core.tenant.TenantManager; import com.mybatisflex.mapper.TenantAccountMapper; @@ -27,10 +26,6 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import javax.sql.DataSource; -import static com.mybatisflex.core.query.QueryMethods.select; -import static com.mybatisflex.test.table.Tables.ACCOUNT; -import static com.mybatisflex.test.table.Tables.TENANT_ACCOUNT; - public class TenantTester { public static void main(String[] args) { @@ -61,15 +56,17 @@ public class TenantTester { TenantAccountMapper mapper = MybatisFlexBootstrap.getInstance().getMapper(TenantAccountMapper.class); - mapper.selectListByQuery(QueryWrapper.create() - .select(TENANT_ACCOUNT.ALL_COLUMNS) - .from(TENANT_ACCOUNT.as("c"), ACCOUNT.as("b")) - .where(TENANT_ACCOUNT.ID.eq(ACCOUNT.ID)) - .and(TENANT_ACCOUNT.ID.eq(1)) - .unionAll(select(TENANT_ACCOUNT.ALL_COLUMNS).from(TENANT_ACCOUNT) - .where(TENANT_ACCOUNT.ID.eq(2)) - ) - ); +// mapper.selectListByQuery(QueryWrapper.create() +// .select(TENANT_ACCOUNT.ALL_COLUMNS) +// .from(TENANT_ACCOUNT.as("c"), ACCOUNT.as("b")) +// .where(TENANT_ACCOUNT.ID.eq(ACCOUNT.ID)) +// .and(TENANT_ACCOUNT.ID.eq(1)) +// .unionAll(select(TENANT_ACCOUNT.ALL_COLUMNS).from(TENANT_ACCOUNT) +// .where(TENANT_ACCOUNT.ID.eq(2)) +// ) +// ); + +// mapper.deleteBatchByIds(Arrays.asList(1, 2)); // // //SELECT * FROM `tb_account` WHERE `tenant_id` = 1