dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13481 from thingsboard/master-rc

Browse Source 
rc
This commit is contained in:
Viacheslav Klimov 2025-05-30 12:06:36 +03:00 committed by GitHub
commit 0dedb13695
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AbstractEntityFields.java
View File

@ -17,7 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
import lombok.Data; import lombok.Data;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.EntityId;
import java.util.UUID; import java.util.UUID;
@ -36,7 +36,7 @@ public class AbstractEntityFields implements EntityFields {
this.id = id; this.id = id;
this.createdTime = createdTime; this.createdTime = createdTime;
this.tenantId = tenantId; this.tenantId = tenantId;
this.customerId = (customerId != null && customerId != CustomerId.NULL_UUID) ? customerId : null; this.customerId = checkId(customerId);
this.name = name; this.name = name;
this.version = version; this.version = version;
} }
@ -62,4 +62,8 @@ public class AbstractEntityFields implements EntityFields {
this(id, createdTime, tenantId, null, null, null); this(id, createdTime, tenantId, null, null, null);
} }
protected UUID checkId(UUID id) {
return id != null && !id.equals(EntityId.NULL_UUID) ? id : null;
}
} }

2
common/edqs/src/main/java/org/thingsboard/server/edqs/repo/TenantRepo.java
View File

@ -191,7 +191,7 @@ public class TenantRepo {
getEntitySet(entityType).add(entityData); getEntitySet(entityType).add(entityData);
} }
UUID newCustomerId = CustomerId.NULL_UUID.equals(fields.getCustomerId()) ? null : fields.getCustomerId(); UUID newCustomerId = fields.getCustomerId();
UUID oldCustomerId = entityData.getCustomerId(); UUID oldCustomerId = entityData.getCustomerId();
entityData.setCustomerId(newCustomerId); entityData.setCustomerId(newCustomerId);
if (entityIdMismatch(oldCustomerId, newCustomerId)) { if (entityIdMismatch(oldCustomerId, newCustomerId)) {