diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java index 6373e06..1f9294a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/MenuServiceImpl.java @@ -279,8 +279,12 @@ public class MenuServiceImpl implements MenuService { } return menus; } - MenuDto dto = this.findById(menuDto.getPid()); - menus.addAll((Collection) dto); + //pid 不为null + JSONArray arr = menuTab.query("pid = '"+menuDto.getPid()+"'").getResultJSONArray(0); + for (int i = 0; i < arr.size(); i++) { + JSONObject json = arr.getJSONObject(i); + menus.add(this.menuJsonToMenuDto(json)); + } return getSuperior(findById(menuDto.getPid()), menus); } diff --git a/nladmin-ui/src/views/system/menu/index.vue b/nladmin-ui/src/views/system/menu/index.vue index 9a58fc8..65ed64a 100644 --- a/nladmin-ui/src/views/system/menu/index.vue +++ b/nladmin-ui/src/views/system/menu/index.vue @@ -4,13 +4,28 @@
- +
- + @@ -19,8 +34,8 @@ 按钮 - - + + LMSPC LMS手持 ACSPC @@ -43,13 +58,19 @@ > - + - - + + @@ -67,31 +88,43 @@ - + - + - + - + - + + @@ -111,6 +144,7 @@ :data="crud.data" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="menu_id" + @select="crud.selectChange" @select-all="crud.selectAllChange" @selection-change="crud.selectionChangeHandler" @@ -131,21 +165,21 @@ - + @@ -154,7 +188,13 @@ {{ parseTime(scope.row.createTime) }} - +