Improvement optimization is not perfroming while text search is not null

3 years ago · 596d0f1135
1 changed files with 1 additions and 1 deletions
--- 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);
        }