|
@@ -126,12 +126,11 @@ public class MenuService extends BaseService<MenuMapper, Menu> implements IMenuS
|
|
|
menuVOList = menuMapper.selectListWithRelationsByQueryAs(queryWrapper.orderBy(Menu::getOrderNum).asc(),
|
|
|
MenuVO.class);
|
|
|
} else {
|
|
|
- queryWrapper.select(QueryMethods.distinct(ROLE_MENU.MENU_ID))
|
|
|
+ List<String> menuIds = roleMenuMapper.selectListByQueryAs(QueryWrapper.create().select(QueryMethods.distinct(ROLE_MENU.MENU_ID))
|
|
|
.from(USER_ROLE.as("urt"))
|
|
|
.leftJoin(ROLE_MENU.as("rmt")).on(USER_ROLE.ROLE_ID.eq(ROLE_MENU.ROLE_ID))
|
|
|
- .where(USER_ROLE.USER_ID.eq(userId));
|
|
|
- List<String> menuIds = roleMenuMapper.selectListByQueryAs(queryWrapper, String.class);
|
|
|
- menuVOList = menuMapper.selectListWithRelationsByQueryAs(QueryWrapper.create().in(Menu::getMenuId, menuIds).orderBy(Menu::getOrderNum).asc(), MenuVO.class);
|
|
|
+ .where(USER_ROLE.USER_ID.eq(userId)), String.class);
|
|
|
+ menuVOList = menuMapper.selectListWithRelationsByQueryAs(queryWrapper.in(Menu::getMenuId, menuIds).orderBy(Menu::getOrderNum).asc(), MenuVO.class);
|
|
|
}
|
|
|
List<JSONObject> resultJsonObjectList = menuVOList.stream().map(menuVO -> {
|
|
|
JSONObject menu = JsonUtils.parseObj(menuVO);
|