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

getMaxLevel has refactored to simplify the code

Browse Source
This commit is contained in:
Sergey Matvienko 2021-10-15 14:56:06 +03:00 committed by Andrew Shvayka
parent 2c743f647c
commit caddc4d4d7
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -716,12 +716,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
}
int getMaxLevel(int maxLevel) {
int level = maxLevel > 0 ? maxLevel : this.maxLevelAllowed;
if (level > this.maxLevelAllowed) {
log.debug("hierarchy level {} is reduced down to maxLevelAllowed {}", level, this.maxLevelAllowed);
return this.maxLevelAllowed;
}
return level;
return (maxLevel <= 0 || maxLevel > this.maxLevelAllowed) ? this.maxLevelAllowed : maxLevel;
}
private String getQueryTemplate(EntitySearchDirection direction) {