zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:数据入库租户id填充不正确修复

V0.5.x
xiwa 2024-03-18 23:26:33 +08:00
parent b47756096d
commit 85a0ccedb5
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/IJPACommData.java
View File

@ -6,6 +6,7 @@ import cc.iotkit.common.tenant.dao.TenantAware;
import cc.iotkit.common.tenant.entiry.BaseTenantEntity; import cc.iotkit.common.tenant.entiry.BaseTenantEntity;
import cc.iotkit.common.tenant.helper.TenantHelper; import cc.iotkit.common.tenant.helper.TenantHelper;
import cc.iotkit.common.utils.MapstructUtils; import cc.iotkit.common.utils.MapstructUtils;
import cc.iotkit.common.utils.StringUtils;
import cc.iotkit.data.ICommonData; import cc.iotkit.data.ICommonData;
import cc.iotkit.data.model.BaseEntity; import cc.iotkit.data.model.BaseEntity;
import cc.iotkit.data.util.PageBuilder; import cc.iotkit.data.util.PageBuilder;
@ -61,7 +62,15 @@ public interface IJPACommData<T extends Id<ID>, ID> extends ICommonData<T, ID> {
tbData = dbObj; tbData = dbObj;
} }
if (tbData instanceof TenantAware) { if (tbData instanceof TenantAware) {
((TenantAware) tbData).setTenantId(TenantHelper.getTenantId()); String sourceTid = null;
if (data instanceof TenantModel) {
sourceTid = ((TenantModel) data).getTenantId();
}
String tenantId = TenantHelper.getTenantId();
//未指定租户id,使用当前用户所属租户id
if (StringUtils.isBlank(sourceTid) && tenantId != null) {
((TenantAware) tbData).setTenantId(tenantId);
}
} }
Object o = getBaseRepository().save(tbData); Object o = getBaseRepository().save(tbData);