dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed search for resources

Browse Source
This commit is contained in:
YevhenBondarenko 2021-07-02 14:39:46 +03:00 committed by Andrew Shvayka
parent 759e8ee3c7
commit 3fc45654e8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dao/src/main/java/org/thingsboard/server/dao/sql/resource/TbResourceInfoRepository.java
View File

@ -27,7 +27,7 @@ import java.util.UUID;
public interface TbResourceInfoRepository extends CrudRepository<TbResourceInfoEntity, UUID> { public interface TbResourceInfoRepository extends CrudRepository<TbResourceInfoEntity, UUID> {
@Query("SELECT tr FROM TbResourceInfoEntity tr WHERE " + @Query("SELECT tr FROM TbResourceInfoEntity tr WHERE " +
"LOWER(tr.searchText) LIKE LOWER(CONCAT(:searchText, '%'))" + "LOWER(tr.title) LIKE LOWER(CONCAT('%', :searchText, '%'))" +
"AND (tr.tenantId = :tenantId " + "AND (tr.tenantId = :tenantId " +
"OR (tr.tenantId = :systemAdminId " + "OR (tr.tenantId = :systemAdminId " +
"AND NOT EXISTS " + "AND NOT EXISTS " +
@ -42,7 +42,7 @@ public interface TbResourceInfoRepository extends CrudRepository<TbResourceInfoE
@Query("SELECT ri FROM TbResourceInfoEntity ri WHERE " + @Query("SELECT ri FROM TbResourceInfoEntity ri WHERE " +
"ri.tenantId = :tenantId " + "ri.tenantId = :tenantId " +
"AND LOWER(ri.searchText) LIKE LOWER(CONCAT(:searchText, '%'))") "AND LOWER(ri.title) LIKE LOWER(CONCAT('%', :searchText, '%'))")
Page<TbResourceInfoEntity> findTenantResourcesByTenantId(@Param("tenantId") UUID tenantId, Page<TbResourceInfoEntity> findTenantResourcesByTenantId(@Param("tenantId") UUID tenantId,
@Param("searchText") String searchText, @Param("searchText") String searchText,
Pageable pageable); Pageable pageable);