From 2bf910ced1ded9651f71adae96d86200faed03cd Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Thu, 6 Aug 2020 15:55:32 +0300 Subject: [PATCH] EntityViewSearchQuery improvement --- .../server/dao/sql/query/DefaultEntityQueryRepository.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 6e247ff234..4fe58f7da4 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 @@ -437,7 +437,9 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { //TODO: fetch last level only. //TODO: fetch distinct records. String lvlFilter = getLvlFilter(entityFilter.getMaxLevel()); - String selectFields = "SELECT tenant_id, customer_id, id, created_time, type, name, label FROM " + entityType.name() + " WHERE id in ( SELECT entity_id"; + String selectFields = "SELECT tenant_id, customer_id, id, created_time, type, name " + + (entityType.equals(EntityType.ENTITY_VIEW) ? "" : ", label ") + + "FROM " + entityType.name() + " WHERE id in ( SELECT entity_id"; String from = getQueryTemplate(entityFilter.getDirection()); String whereFilter = " WHERE"; if (!StringUtils.isEmpty(entityFilter.getRelationType())) {