From 85a0ccedb5db3d33d7480b85043f563f4762ea79 Mon Sep 17 00:00:00 2001 From: xiwa Date: Mon, 18 Mar 2024 23:26:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=95=B0=E6=8D=AE=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=A7=9F=E6=88=B7id=E5=A1=AB=E5=85=85=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cc/iotkit/data/dao/IJPACommData.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/IJPACommData.java b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/IJPACommData.java index 1ae68f3d..8fb67257 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/IJPACommData.java +++ b/iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/dao/IJPACommData.java @@ -6,6 +6,7 @@ import cc.iotkit.common.tenant.dao.TenantAware; import cc.iotkit.common.tenant.entiry.BaseTenantEntity; import cc.iotkit.common.tenant.helper.TenantHelper; import cc.iotkit.common.utils.MapstructUtils; +import cc.iotkit.common.utils.StringUtils; import cc.iotkit.data.ICommonData; import cc.iotkit.data.model.BaseEntity; import cc.iotkit.data.util.PageBuilder; @@ -61,7 +62,15 @@ public interface IJPACommData, ID> extends ICommonData { tbData = dbObj; } 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);