|
|
@@ -507,7 +507,11 @@ public class UserServiceImpl implements UserService {
|
|
|
Set<Role> roles = user.getRoles();
|
|
|
if (!org.apache.commons.collections.CollectionUtils.isEmpty(roles)) {
|
|
|
for (Role role : roles) {
|
|
|
- resourceItems = role.getResourceItems();
|
|
|
+ if (!org.apache.commons.collections.CollectionUtils.isEmpty(role.getResourceItems())) {
|
|
|
+ for (ResourceItem resourceItem : role.getResourceItems()) {
|
|
|
+ resourceItems.add(resourceItem);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
//匹配当前访问权限;
|