Browse Source

Fixed dao for customer

pull/1078/merge
Volodymyr Babak 8 years ago
parent
commit
5c31884c68
  1. 4
      dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java

4
dao/src/main/java/org/thingsboard/server/dao/sql/entityview/JpaEntityViewDao.java

@ -100,7 +100,7 @@ public class JpaEntityViewDao extends JpaAbstractSearchTextDao<EntityViewEntity,
entityViewRepository.findByTenantIdAndCustomerId( entityViewRepository.findByTenantIdAndCustomerId(
fromTimeUUID(tenantId), fromTimeUUID(tenantId),
fromTimeUUID(customerId), fromTimeUUID(customerId),
Objects.toString(pageLink, ""), Objects.toString(pageLink.getTextSearch(), ""),
pageLink.getIdOffset() == null ? NULL_UUID_STR : fromTimeUUID(pageLink.getIdOffset()), pageLink.getIdOffset() == null ? NULL_UUID_STR : fromTimeUUID(pageLink.getIdOffset()),
new PageRequest(0, pageLink.getLimit()) new PageRequest(0, pageLink.getLimit())
)); ));
@ -116,7 +116,7 @@ public class JpaEntityViewDao extends JpaAbstractSearchTextDao<EntityViewEntity,
fromTimeUUID(tenantId), fromTimeUUID(tenantId),
fromTimeUUID(customerId), fromTimeUUID(customerId),
fromTimeUUID(entityId), fromTimeUUID(entityId),
Objects.toString(pageLink, ""), Objects.toString(pageLink.getTextSearch(), ""),
pageLink.getIdOffset() == null ? NULL_UUID_STR : fromTimeUUID(pageLink.getIdOffset()), pageLink.getIdOffset() == null ? NULL_UUID_STR : fromTimeUUID(pageLink.getIdOffset()),
new PageRequest(0, pageLink.getLimit()) new PageRequest(0, pageLink.getLimit())
)); ));

Loading…
Cancel
Save