From 939904773774f37a55cb0a40e3da1694db997cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <1474983351@qq.com> Date: Fri, 4 Oct 2024 09:44:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A6=82=E6=9E=9C=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9C=89=E5=80=BC=EF=BC=8C=E5=88=99=E4=B8=8D?= =?UTF-8?q?=E8=A6=86=E7=9B=96=EF=BC=8C=E5=85=B3=E9=97=AD=20https://gitee.c?= =?UTF-8?q?om/mybatis-flex/mybatis-flex/issues/I7OWYD=20https://gitee.com/?= =?UTF-8?q?mybatis-flex/mybatis-flex/issues/I920DK=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mybatisflex/core/table/TableInfo.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java index 2875a34b..acd0b47f 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java @@ -1398,6 +1398,15 @@ public class TableInfo { } MetaObject metaObject = EntityMetaObject.forObject(entityObject, reflectorFactory); + + // 如果租户字段有值，则不覆盖。 + // https://gitee.com/mybatis-flex/mybatis-flex/issues/I7OWYD + // https://gitee.com/mybatis-flex/mybatis-flex/issues/I920DK + String property = columnInfoMapping.get(tenantIdColumn).property; + if (metaObject.getValue(property) != null) { + return; + } + Object[] tenantIds = TenantManager.getTenantIds(tableName); if (tenantIds == null || tenantIds.length == 0) { return; @@ -1406,7 +1415,6 @@ public class TableInfo { // 默认使用第一个作为插入的租户ID Object tenantId = tenantIds[0]; if (tenantId != null) { - String property = columnInfoMapping.get(tenantIdColumn).property; Class setterType = metaObject.getSetterType(property); metaObject.setValue(property, ConvertUtil.convert(tenantId, setterType)); }