thingsboard-aplcache

Fixed dao for customer

9/11/2018 7:22:34 AM

Volodymyr Babak

Commit: 5c31884

Tree: 1a379f7

Parents: 08e166d

Changes

dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java 4(+2 -2)

Details

dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java 4(+2 -2)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java
index 6ef0acb..2f3edbe 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java
@@ -100,7 +100,7 @@ public class JpaEntityViewDao extends JpaAbstractSearchTextDao<EntityViewEntity,
                 entityViewRepository.findByTenantIdAndCustomerId(
                         fromTimeUUID(tenantId),
                         fromTimeUUID(customerId),
-                        Objects.toString(pageLink, ""),
+                        Objects.toString(pageLink.getTextSearch(), ""),
                         pageLink.getIdOffset() == null ? NULL_UUID_STR : fromTimeUUID(pageLink.getIdOffset()),
                         new PageRequest(0, pageLink.getLimit())
                 ));
@@ -116,7 +116,7 @@ public class JpaEntityViewDao extends JpaAbstractSearchTextDao<EntityViewEntity,
                         fromTimeUUID(tenantId),
                         fromTimeUUID(customerId),
                         fromTimeUUID(entityId),
-                        Objects.toString(pageLink, ""),
+                        Objects.toString(pageLink.getTextSearch(), ""),
                         pageLink.getIdOffset() == null ? NULL_UUID_STR : fromTimeUUID(pageLink.getIdOffset()),
                         new PageRequest(0, pageLink.getLimit())
                 ));