|
@@ -244,7 +244,7 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
|
|
|
if(roleIds.contains(RoleEnum.STUDENT.getCode())){
|
|
if(roleIds.contains(RoleEnum.STUDENT.getCode())){
|
|
|
LambdaQueryWrapper<XjrMenuGroupSet> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<XjrMenuGroupSet> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper
|
|
queryWrapper
|
|
|
- .orderByDesc(XjrMenuGroupSet::getId)
|
|
|
|
|
|
|
+ .orderByAsc(XjrMenuGroupSet::getId)
|
|
|
.select(XjrMenuGroupSet.class,x -> VoToColumnUtil.fieldsToColumns(XjrMenuGroupSetPageVo.class).contains(x.getProperty()));
|
|
.select(XjrMenuGroupSet.class,x -> VoToColumnUtil.fieldsToColumns(XjrMenuGroupSetPageVo.class).contains(x.getProperty()));
|
|
|
List<XjrMenuGroupSet> list = xjrMenuGroupSetService.list(queryWrapper);
|
|
List<XjrMenuGroupSet> list = xjrMenuGroupSetService.list(queryWrapper);
|
|
|
Map<Long, Integer> menuUsedMap = new HashMap<>();
|
|
Map<Long, Integer> menuUsedMap = new HashMap<>();
|