|
@@ -250,7 +250,7 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
|
|
List<MenuVo> result = new ArrayList<>();
|
|
List<MenuVo> result = new ArrayList<>();
|
|
Map<Long, Long> menuGroupMap = new HashMap<>();
|
|
Map<Long, Long> menuGroupMap = new HashMap<>();
|
|
Map<Long, Integer> menuDisabledMap = new HashMap<>();
|
|
Map<Long, Integer> menuDisabledMap = new HashMap<>();
|
|
- if(roleIds.contains(RoleEnum.STUDENT.getCode())){
|
|
|
|
|
|
+ if(roleIds.contains(RoleEnum.STUDENT.getCode()) || roleIds.contains(RoleEnum.PARENT.getCode())){
|
|
LambdaQueryWrapper<XjrMenuGroupSet> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<XjrMenuGroupSet> queryWrapper = new LambdaQueryWrapper<>();
|
|
queryWrapper
|
|
queryWrapper
|
|
.orderByAsc(XjrMenuGroupSet::getId)
|
|
.orderByAsc(XjrMenuGroupSet::getId)
|