From 596d0f113543551fc4c928457ea435c967426908 Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Mon, 1 Apr 2024 15:46:01 +0300
Subject: [PATCH] Improvement optimization is not perfroming while text search
 is not null

---
 .../org/thingsboard/server/dao/entity/BaseEntityService.java    | 2 +-
 1 file changed, 1 insertion(+), 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 2b426ad686..eac63276eb 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,7 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
         validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
         validateEntityDataQuery(query);
 
-        if (EntityFilterType.RELATIONS_QUERY.equals(query.getEntityFilter().getType())) {
+        if (EntityFilterType.RELATIONS_QUERY.equals(query.getEntityFilter().getType()) || query.getPageLink().getTextSearch() != null) {
             return this.entityQueryDao.findEntityDataByQuery(tenantId, customerId, query);
         }