diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java index 0502fc3..f06f16b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java @@ -75,7 +75,7 @@ public class SysMenuController { @GetMapping @ApiOperation("查询菜单") @SaCheckPermission("menu:list") - public ResponseEntity pageQuery(@RequestBody MenuQuery query, PageQuery page) throws Exception { + public ResponseEntity pageQuery(@RequestParam Map query, PageQuery page) throws Exception { List list = iSysMenuService.query(query, page); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java index cb3e286..7bcb8a0 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java @@ -34,7 +34,7 @@ public interface ISysMenuService extends IService { * @param page * @return */ - List query(MenuQuery query, PageQuery page); + List query(Map query, PageQuery page); /** * 根据ID获取同级与上级数据 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java index a029afd..231f116 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java @@ -53,8 +53,15 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override - public List query(MenuQuery query, PageQuery page) { - Page menuPage = this.page(page.build(), query.build()); + public List query(Map query, PageQuery page) { + String pid = MapUtil.getStr(query, "pid"); + QueryWrapper wrapper = new QueryWrapper<>(); + if (StringUtils.isEmpty(pid)){ + wrapper.isNull("pid"); + }else { + wrapper.eq("pid",pid); + } + Page menuPage = this.page(page.build(), wrapper); List collect = menuPage.getRecords().stream().map(menu -> this.doToDto(menu)).collect(Collectors.toList()); return collect; } diff --git a/nladmin-ui/src/views/system/menu/index.vue b/nladmin-ui/src/views/system/menu/index.vue index 579e711..c03200c 100644 --- a/nladmin-ui/src/views/system/menu/index.vue +++ b/nladmin-ui/src/views/system/menu/index.vue @@ -14,8 +14,8 @@ @keyup.enter.native="queryBlurry" /> @@ -27,7 +27,7 @@ - + { crudMenu.getMenus(params).then(res => { resolve(res.content) }) }, 100) }, - getSupDepts(menu_id) { + getSupMenus(menu_id) { crudMenu.getMenuSuperior(menu_id).then(res => { const children = res.map(function(obj) { if (!obj.leaf && !obj.children) { @@ -337,12 +337,12 @@ export default { } return obj }) - this.menus = [{ menu_id: 0, title: '顶级类目', children: children }] + this.menus = [{ menuId: 0, title: '顶级类目', children: children }] }) }, loadMenus({ action, parentNode, callback }) { if (action === LOAD_CHILDREN_OPTIONS) { - crudMenu.getMenusTree(parentNode.menu_id).then(res => { + crudMenu.getMenusTree(parentNode.menuId).then(res => { parentNode.children = res.map(function(obj) { if (!obj.leaf) { obj.children = null diff --git a/nladmin-ui/src/views/system/menu/menu.js b/nladmin-ui/src/views/system/menu/menu.js index b857ddf..acdda04 100644 --- a/nladmin-ui/src/views/system/menu/menu.js +++ b/nladmin-ui/src/views/system/menu/menu.js @@ -2,14 +2,14 @@ import request from '@/utils/request' export function getMenusTree(pid) { return request({ - url: 'api/menus/lazy?pid=' + pid, + url: 'api/sysMenu/lazy?pid=' + pid, method: 'get' }) } export function getMenus(params) { return request({ - url: 'api/menus', + url: 'api/sysMenu', method: 'get', params }) @@ -17,19 +17,18 @@ export function getMenus(params) { export function getMenusByRole(params) { return request({ - url: 'api/menus/getMenusByRole', + url: 'api/sysMenu/getMenusByRole', method: 'post', data: params }) } export function getMenuSuperior(ids) { - // const data = ids.length || ids.length === 0 ? ids : Array.of(ids) const data = { 'ids': ids } return request({ - url: 'api/menus/superior', + url: 'api/sysMenu/superior', method: 'post', data }) @@ -37,21 +36,21 @@ export function getMenuSuperior(ids) { export function getChild(id) { return request({ - url: 'api/menus/child?id=' + id, + url: 'api/sysMenu/child?id=' + id, method: 'get' }) } export function buildMenus(data) { return request({ - url: 'api/menus/build?system_type=' + data, + url: 'api/sysMenu/build?systemType=' + data, method: 'get' }) } export function add(data) { return request({ - url: 'api/menus', + url: 'api/sysMenu', method: 'post', data }) @@ -59,7 +58,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/menus', + url: 'api/sysMenu', method: 'delete', data: ids }) @@ -67,7 +66,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/menus', + url: 'api/sysMenu', method: 'put', data })