diff --git a/src/main/java/kcg/faics/cmmn/aop/CommonAop.java b/src/main/java/kcg/faics/cmmn/aop/CommonAop.java index f0bec64..bd95737 100644 --- a/src/main/java/kcg/faics/cmmn/aop/CommonAop.java +++ b/src/main/java/kcg/faics/cmmn/aop/CommonAop.java @@ -81,12 +81,10 @@ public class CommonAop { MenuVO menuVO = new MenuVO(); menuVO.setUserId(loginUserVO.getUserid()); menuVO.setUserType(loginUserVO.getType()); - List mainMenuList = menuService - .selectMainMenuList(menuVO); + List mainMenuList = menuService.selectMainMenuList(menuVO); model.addAttribute("mainMenuList", mainMenuList); - List topSubMenuList = menuService - .selectTopSubMenuList(menuVO); + List topSubMenuList = menuService.selectTopSubMenuList(menuVO); model.addAttribute("topSubMenuList", topSubMenuList); @@ -114,12 +112,8 @@ public class CommonAop { default: if (req.getParameter("category") != null - && !req.getParameter("category") - .equals(" ")) { - qryCate = "category=" - + req.getParameter("category"); - // url = url + "/" + - // req.getParameter("category"); + && !req.getParameter("category").equals(" ")) { + qryCate = "category=" + req.getParameter("category"); } break; } @@ -130,19 +124,14 @@ public class CommonAop { menu.put("boardId", boardId); menu.put("query", qryCate); - HashMap menuInfo = menuService - .getMenuInfo(menu); - menuVO.setId(Integer - .parseInt(menuInfo.get("ID").toString())); + HashMap menuInfo = menuService.getMenuInfo(menu); + menuVO.setId(Integer.parseInt(menuInfo.get("ID").toString())); menuInfo.put("userId", loginUserVO.getUserid()); - List currAndHigherMenuList = menuService - .selectListWithHigher(menuVO); - model.addAttribute("currAndHigherMenuList", - currAndHigherMenuList); + List currAndHigherMenuList = menuService.selectListWithHigher(menuVO); + model.addAttribute("currAndHigherMenuList", currAndHigherMenuList); model.addAttribute("menu", menuInfo); - model.addAttribute("subMenu", - menuService.getSubmenu(menuInfo)); + model.addAttribute("subMenu", menuService.getSubmenu(menuInfo)); addUserLog(req, menu); } diff --git a/src/main/java/kcg/faics/cmmn/service/impl/MenuServiceImpl.java b/src/main/java/kcg/faics/cmmn/service/impl/MenuServiceImpl.java index f946577..55fa092 100644 --- a/src/main/java/kcg/faics/cmmn/service/impl/MenuServiceImpl.java +++ b/src/main/java/kcg/faics/cmmn/service/impl/MenuServiceImpl.java @@ -34,16 +34,14 @@ public class MenuServiceImpl implements MenuService { LoginUserVO loginUserVO = UserUtil.getMemberInfo(); menuVO.setDepth(1); + menuVO.setMaxLevel(2); menuVO.setMenuPosition(MenuPosition.TOP); List list = menuMapper.selectListWithConnectBy(menuVO); List menuList = new ArrayList(); - - MenuVO prevMenu = null; - for (int i = 0; i < list.size(); i++) { - MenuVO currVO = list.get(i); + + for (MenuVO currVO: list) { if (currVO.getDepth() == 0) { - prevMenu = currVO; - menuList.add(prevMenu); + menuList.add(currVO); } else if (currVO.getDepth() == 1) { // 견문 메뉴 권한 @@ -56,8 +54,13 @@ public class MenuServiceImpl implements MenuService { if (loginUserVO.getAuthManage() <= 0 && !UserUtil.isAdmin() && "관리기능".equals(currVO.getName())) { continue; } - - prevMenu.getSubMenu().add(currVO); + for(MenuVO menu: menuList){ + if(menu.getId()==currVO.getParent()){ + menu.getSubMenu().add(currVO); + break; + } + } + } } @@ -67,6 +70,7 @@ public class MenuServiceImpl implements MenuService { @Override public List selectTopSubMenuList(final MenuVO menuVO) { menuVO.setDepth(0); + menuVO.setMaxLevel(1); menuVO.setMenuPosition(MenuPosition.TOP_SUB); return menuMapper.selectListWithConnectBy(menuVO); } diff --git a/src/main/java/kcg/faics/cmmn/vo/MenuVO.java b/src/main/java/kcg/faics/cmmn/vo/MenuVO.java index b157d03..2a9718c 100644 --- a/src/main/java/kcg/faics/cmmn/vo/MenuVO.java +++ b/src/main/java/kcg/faics/cmmn/vo/MenuVO.java @@ -85,7 +85,17 @@ public class MenuVO { */ private int userType; - /** + private int maxLevel; + + public int getMaxLevel() { + return maxLevel; + } + + public void setMaxLevel(int maxLevel) { + this.maxLevel = maxLevel; + } + + /** * @return the id */ public final int getId() { diff --git a/src/main/resources/sqlmapper/mappers/cmmn/menu.xml b/src/main/resources/sqlmapper/mappers/cmmn/menu.xml index 4b0f6a2..1c7ab68 100644 --- a/src/main/resources/sqlmapper/mappers/cmmn/menu.xml +++ b/src/main/resources/sqlmapper/mappers/cmmn/menu.xml @@ -33,36 +33,64 @@ - +