From eea8f977b19f2b8acc941bdb426a7917d240c769 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Tue, 14 Mar 2023 16:44:31 +0100 Subject: [PATCH] added tenant profile type to the entityTableMap (EntityQuery) --- .../dao/sql/query/DefaultEntityQueryRepository.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java index 8f9226c180..2885776a6d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java @@ -241,6 +241,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { entityTableMap.put(EntityType.RULE_CHAIN, "rule_chain"); entityTableMap.put(EntityType.DEVICE_PROFILE, "device_profile"); entityTableMap.put(EntityType.ASSET_PROFILE, "asset_profile"); + entityTableMap.put(EntityType.TENANT_PROFILE, "tenant_profile"); } public static EntityType[] RELATION_QUERY_ENTITY_TYPES = new EntityType[]{ @@ -315,13 +316,8 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { if (query.getKeyFilters() == null || query.getKeyFilters().isEmpty()) { ctx.append("select count(e.id) from "); ctx.append(addEntityTableQuery(ctx, query.getEntityFilter())); -// -// if (TenantId.SYS_TENANT_ID.equals(tenantId)) { -// ctx.append(" e"); -// } else { - ctx.append(" e where "); - ctx.append(buildEntityWhere(ctx, query.getEntityFilter(), Collections.emptyList())); -// } + ctx.append(" e where "); + ctx.append(buildEntityWhere(ctx, query.getEntityFilter(), Collections.emptyList())); return transactionTemplate.execute(status -> { long startTs = System.currentTimeMillis();