Browse Source

Improvement: do not use 2 queries for single_entity

pull/10386/head
Andrii Landiak 2 years ago
parent
commit
fe5b4606eb
  1. 4
      dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java

4
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);
}

Loading…
Cancel
Save