menu

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<Object> pageQuery(@RequestBody MenuQuery query, PageQuery page) throws Exception {
+    public ResponseEntity<Object> pageQuery(@RequestParam Map query, PageQuery page) throws Exception {
         List list = iSysMenuService.query(query, page);
         return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
     }

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java

@@ -34,7 +34,7 @@ public interface ISysMenuService extends IService<SysMenu> {
      * @param page
      * @return
      */
-    List query(MenuQuery query, PageQuery page);
+    List query(Map query, PageQuery page);
 
     /**
      * 根据ID获取同级与上级数据

nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java

@@ -53,8 +53,15 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 
 
     @Override
-    public List query(MenuQuery query, PageQuery page) {
+    public List query(Map query, PageQuery page) {
-        Page<SysMenu> menuPage = this.page(page.build(), query.build());
+        String pid = MapUtil.getStr(query, "pid");
+        QueryWrapper<SysMenu> wrapper = new QueryWrapper<>();
+        if (StringUtils.isEmpty(pid)){
+            wrapper.isNull("pid");
+        }else {
+            wrapper.eq("pid",pid);
+        }
+        Page<SysMenu> menuPage = this.page(page.build(), wrapper);
         List<MenuDto> collect = menuPage.getRecords().stream().map(menu -> this.doToDto(menu)).collect(Collectors.toList());
         return collect;
     }

nladmin-ui/src/views/system/menu/index.vue

@@ -14,8 +14,8 @@
           @keyup.enter.native="queryBlurry"
         />
         <el-select
-          style="width: 100px; height: 35px;top: -5px;"
           v-model="query.system_type"
+          style="width: 100px; height: 35px;top: -5px;"
           placeholder="切换系统"
           @change="changetype"
         >
@@ -27,7 +27,7 @@
         </el-select>
         <rrOperation />
       </div>
-      <crudOperation :permission="permission"/>
+      <crudOperation :permission="permission" />
     </div>
     <!--表单渲染-->
     <el-dialog
@@ -142,7 +142,7 @@
       :auto-load-root-options="false"
       :data="crud.data"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-      row-key="menu_id"
+      row-key="menuId"
 
       @select="crud.selectChange"
       @select-all="crud.selectAllChange"
@@ -216,7 +216,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import DateRangePicker from '@/components/DateRangePicker'
-import Dict from "../../../components/Dict/Dict";
+import Dict from '../../../components/Dict/Dict'
 
 // crud交由presenter持有
 const defaultForm = {
@@ -241,7 +241,7 @@ export default {
   name: 'Menu',
   components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '菜单', idField: 'menu_id', url: 'api/menus', crudMethod: { ...crudMenu }})
+    return CRUD({ title: '菜单', idField: 'menuId', url: 'api/sysMenu', crudMethod: { ...crudMenu }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['system_type'],
@@ -268,7 +268,7 @@ export default {
   methods: {
     normalizer(node) {
       return {
-        id: node.menu_id,
+        id: node.menuId,
         label: node.title,
         children: node.children
       }
@@ -294,13 +294,13 @@ export default {
     [CRUD.HOOK.afterToCU](crud, form) {
       console.log(this.dict)
       this.menus = []
-      if (form.menu_id) { // 修改
+      if (form.menuId) { // 修改
         if (!form.pid) { // 一级菜单，一级的父级菜单的pid为0.
           form.pid = 0
         }
-        this.getSupDepts(form.menu_id)
+        this.getSupMenus(form.menuId)
       } else { // 新增
-        this.menus.push({ menu_id: 0, title: '顶级类目', children: null })
+        this.menus.push({ menuId: 0, title: '顶级类目', children: null })
       }
     },
     [CRUD.HOOK.afterSubmit](crud, form) {
@@ -322,14 +322,14 @@ export default {
       }
     },
     getMenus(tree, treeNode, resolve) {
-      const params = { pid: tree.menu_id, system_type: tree.system_type }
+      const params = { pid: tree.menuId, systemType: tree.systemType }
       setTimeout(() => {
         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

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
   })