Browse Source

Merge pull request #13482 from AndriiLandiak/fix-find-tenant-by-name

Fix findTenantByName as tenant tile is not unique
pull/13486/head
Viacheslav Klimov 1 year ago
committed by GitHub
parent
commit
460a793aa1
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java

2
dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java

@ -95,7 +95,7 @@ public class JpaTenantDao extends JpaAbstractDao<TenantEntity, Tenant> implement
@Override
public Tenant findTenantByName(TenantId tenantId, String name) {
return DaoUtil.getData(tenantRepository.findTenantByTitle(name));
return DaoUtil.getData(tenantRepository.findFirstByTitle(name));
}
@Override

2
dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java

@ -60,6 +60,6 @@ public interface TenantRepository extends JpaRepository<TenantEntity, UUID> {
"t.additionalInfo, t.country, t.state, t.city, t.address, t.address2, t.zip, t.phone, t.email, t.region) FROM TenantEntity t WHERE t.id > :id ORDER BY t.id")
List<TenantFields> findNextBatch(@Param("id") UUID id, Limit limit);
TenantEntity findTenantByTitle(String name);
TenantEntity findFirstByTitle(String name);
}

Loading…
Cancel
Save