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

Fixed relation search if relationTypeGroup is null

Browse Source
This commit is contained in:
Volodymyr Babak 2018-07-03 16:07:38 +03:00
parent bf2b31b3df
commit f41fabf443
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
View File

@ -555,6 +555,9 @@ public class BaseRelationService implements RelationService {
private ListenableFuture<List<EntityRelation>> findRelations(final EntityId rootId, final EntitySearchDirection direction, RelationTypeGroup relationTypeGroup) { private ListenableFuture<List<EntityRelation>> findRelations(final EntityId rootId, final EntitySearchDirection direction, RelationTypeGroup relationTypeGroup) {
ListenableFuture<List<EntityRelation>> relations; ListenableFuture<List<EntityRelation>> relations;
if (relationTypeGroup == null) {
relationTypeGroup = RelationTypeGroup.COMMON;
}
if (direction == EntitySearchDirection.FROM) { if (direction == EntitySearchDirection.FROM) {
relations = findByFromAsync(rootId, relationTypeGroup); relations = findByFromAsync(rootId, relationTypeGroup);
} else { } else {