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

Refactored to be in sync with PE

Browse Source
This commit is contained in:
Volodymyr Babak 2023-02-08 15:34:12 +02:00
parent 5c0736e76b
commit 56e2ce9241
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java
View File

@ -836,9 +836,14 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
default:
throw new RuntimeException("Not supported!");
}
String typesFilter = "e.type in (:entity_filter_type_query_types)";
ctx.addStringListParameter("entity_filter_type_query_types", types);
ctx.addStringParameter("entity_filter_type_query_name", name);
return "e.type in (:entity_filter_type_query_types) and lower(e.search_text) like lower(concat(:entity_filter_type_query_name, '%%'))";
if (!StringUtils.isEmpty(name)) {
ctx.addStringParameter("entity_filter_type_query_name", name);
return typesFilter + " and lower(e.search_text) like lower(concat(:entity_filter_type_query_name, '%%'))";
} else {
return typesFilter;
}
}
private List<String> checkTypeListForBackwardCompatibility(List<String> types, String subType) {