修补permission为空的情况
This commit is contained in:
parent
78276faf27
commit
64bbc029d9
@ -103,7 +103,7 @@ public class DataScopeAspect {
|
|||||||
if (conditions.contains(dataScope) || StringUtils.equals(role.getStatus(), UserConstants.ROLE_DISABLE)) {
|
if (conditions.contains(dataScope) || StringUtils.equals(role.getStatus(), UserConstants.ROLE_DISABLE)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) {
|
if (StringUtils.isNotEmpty(permission) && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (DATA_SCOPE_ALL.equals(dataScope)) {
|
if (DATA_SCOPE_ALL.equals(dataScope)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user