Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bug][scaleph-security] fix web resource child routes error #637

Merged
merged 1 commit into from
Nov 7, 2023
Merged

[Bug][scaleph-security] fix web resource child routes error #637

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions ...ecurity/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,25 @@ public class SecAuthorizeServiceImpl implements SecAuthorizeService {
*/
@Override
public List<UmiRoute> getWebRoute() {
List<SecResourceWebDTO> secResourceWebDTOS = secResourceWebService.listByPid(0L, null);
List<UmiRoute> routes = new ArrayList<>(secResourceWebDTOS.size());
for (SecResourceWebDTO secResourceWebDTO : secResourceWebDTOS) {
routes.add(buildRoute(secResourceWebDTO));
}
return routes;
return buildRouteByPid(0L);
}

private UmiRoute buildRoute(SecResourceWebDTO secResourceWebDTO) {
UmiRoute route = new UmiRoute();
route.setName(secResourceWebDTO.getName());
route.setPath(secResourceWebDTO.getPath());
route.setRedirect(secResourceWebDTO.getRedirect());
route.setIcon(secResourceWebDTO.getIcon());
route.setComponent(secResourceWebDTO.getComponent());
if (CollectionUtils.isEmpty(secResourceWebDTO.getChildren()) == false) {
List<UmiRoute> routes = new ArrayList<>(secResourceWebDTO.getChildren().size());
for (SecResourceWebDTO child : secResourceWebDTO.getChildren()) {
routes.add(buildRoute(child));
private List<UmiRoute> buildRouteByPid(Long pid) {
List<SecResourceWebDTO> secResourceWebDTOS = secResourceWebService.listByPid(pid, null);
List<UmiRoute> routes = new ArrayList<>(secResourceWebDTOS.size());
for (SecResourceWebDTO secResourceWebDTO : secResourceWebDTOS) {
UmiRoute route = new UmiRoute();
route.setName(secResourceWebDTO.getName());
route.setPath(secResourceWebDTO.getPath());
route.setRedirect(secResourceWebDTO.getRedirect());
route.setIcon(secResourceWebDTO.getIcon());
route.setComponent(secResourceWebDTO.getComponent());
List<UmiRoute> childRoutes = buildRouteByPid(secResourceWebDTO.getId());
if (CollectionUtils.isEmpty(childRoutes) == false) {
route.setRoutes(childRoutes);
}
route.setRoutes(routes);
routes.add(route);
}
return route;
return routes;
}
}