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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
2 additions and
2 deletions
dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java
dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.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 . findTenan tByTitle ( name ) ) ;
return DaoUtil . getData ( tenantRepository . findFirs tByTitle ( name ) ) ;
}
@Override
@ -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 findTenan tByTitle ( String name ) ;
TenantEntity findFirs tByTitle ( String name ) ;
}