From fe5b4606eb82cc71a86929161c763017c4334fe1 Mon Sep 17 00:00:00 2001 From: Andrii Landiak Date: Mon, 1 Apr 2024 16:51:31 +0300 Subject: [PATCH] Improvement: do not use 2 queries for single_entity --- .../org/thingsboard/server/dao/entity/BaseEntityService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java index a0067a07ca..05ed5c7971 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java @@ -86,7 +86,9 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe validateId(customerId, INCORRECT_CUSTOMER_ID + customerId); validateEntityDataQuery(query); - if (EntityFilterType.RELATIONS_QUERY.equals(query.getEntityFilter().getType()) || StringUtils.isNotEmpty(query.getPageLink().getTextSearch())) { + if (EntityFilterType.RELATIONS_QUERY.equals(query.getEntityFilter().getType()) + || EntityFilterType.SINGLE_ENTITY.equals(query.getEntityFilter().getType()) + || StringUtils.isNotEmpty(query.getPageLink().getTextSearch())) { return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, query); }