|
|
|
|
@ -94,7 +94,7 @@ public class DataScopeAspect
|
|
|
|
|
List<String> conditions = new ArrayList<String>();
|
|
|
|
|
List<String> scopeCustomIds = new ArrayList<String>();
|
|
|
|
|
user.getRoles().forEach(role -> {
|
|
|
|
|
if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
|
|
|
|
|
if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && (StringUtils.isEmpty(permission) || StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))))
|
|
|
|
|
{
|
|
|
|
|
scopeCustomIds.add(Convert.toStr(role.getRoleId()));
|
|
|
|
|
}
|
|
|
|
|
@ -107,7 +107,7 @@ public class DataScopeAspect
|
|
|
|
|
{
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
|
|
|
|
|
if (StringUtils.isNotEmpty(permission) && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
|
|
|
|
|
{
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|