Commit 2a97cac6 authored by liuxun's avatar liuxun

merge

parent 961b8504
...@@ -71,7 +71,7 @@ public class RoleController { ...@@ -71,7 +71,7 @@ public class RoleController {
} }
List<SystemRoleResource> roleResources = reqRoleInfo.getResource().stream().map(resourceId -> { List<SystemRoleResource> roleResources = reqRoleInfo.getResource().stream().map(resourceId -> {
SystemRoleResource systemRoleResource = new SystemRoleResource(); SystemRoleResource systemRoleResource = new SystemRoleResource();
systemRoleResource.setRoleId(role.getRoleId()); systemRoleResource.setRoleId(systemRole.getRoleId());
systemRoleResource.setResourceId(resourceId); systemRoleResource.setResourceId(resourceId);
return systemRoleResource; return systemRoleResource;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment