|
|
@@ -159,7 +159,10 @@ public class WebLoginServiceImpl {
|
|
|
// 如果roleRoutes为空,则从字典中获取默认路由
|
|
|
if (roleRouteSet.isEmpty()) {
|
|
|
List<DictDataDO> webRoleRoute = dictDataService.getDictDataListByDictType("web_role_route");
|
|
|
- Set<String> roleRoute = webRoleRoute.stream().map(DictDataDO::getValue).collect(Collectors.toSet());
|
|
|
+ Set<String> roleRoute = webRoleRoute.stream()
|
|
|
+ .filter(dictData -> CommonStatusEnum.ENABLE.getStatus().equals(dictData.getStatus()))
|
|
|
+ .map(DictDataDO::getValue)
|
|
|
+ .collect(Collectors.toSet());
|
|
|
roleRouteSet.addAll(roleRoute);
|
|
|
}
|
|
|
|
|
|
@@ -190,7 +193,10 @@ public class WebLoginServiceImpl {
|
|
|
webRoleRouteVO.setCourseRouteMenuList(roleRouteMenuSet);
|
|
|
}else{
|
|
|
List<DictDataDO> webRoleRoute = dictDataService.getDictDataListByDictType("web_course_menu_route");
|
|
|
- Set<String> roleRoute = webRoleRoute.stream().map(DictDataDO::getValue).collect(Collectors.toSet());
|
|
|
+ Set<String> roleRoute = webRoleRoute.stream()
|
|
|
+ .filter(dictData -> CommonStatusEnum.ENABLE.getStatus().equals(dictData.getStatus()))
|
|
|
+ .map(DictDataDO::getValue)
|
|
|
+ .collect(Collectors.toSet());
|
|
|
webRoleRouteVO.setCourseRouteMenuList(roleRoute);
|
|
|
}
|
|
|
}
|