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

fix: 如果租户字段有值，则不覆盖，关闭 https://gitee.com/mybatis-flex/mybatis-flex/issues/I7OWYD https://gitee.com/mybatis-flex/mybatis-flex/issues/I920DK。

Browse Source
This commit is contained in:
王帅 2024-10-04 09:44:19 +08:00
parent a4aa77d9ce
commit 9399047737
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java
View File

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