diff --git a/src/main/java/kcg/faics/cmmn/aop/CommonAop.java b/src/main/java/kcg/faics/cmmn/aop/CommonAop.java index bd95737..2a29408 100644 --- a/src/main/java/kcg/faics/cmmn/aop/CommonAop.java +++ b/src/main/java/kcg/faics/cmmn/aop/CommonAop.java @@ -52,11 +52,9 @@ public class CommonAop { LogService logService; @Around("execution(* kcg.faics..*Controller.*(..))") - public Object menuGenerator(final ProceedingJoinPoint thisJoinPoint) - throws Throwable { + public Object menuGenerator(final ProceedingJoinPoint thisJoinPoint) throws Throwable { - HttpServletRequest req = ((ServletRequestAttributes) RequestContextHolder - .getRequestAttributes()).getRequest(); + HttpServletRequest req = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String loginUrl = "/loginView.do"; String url = req.getRequestURI(); @@ -125,7 +123,7 @@ public class CommonAop { menu.put("query", qryCate); HashMap menuInfo = menuService.getMenuInfo(menu); - menuVO.setId(Integer.parseInt(menuInfo.get("ID").toString())); + menuVO.setId(((Double)menuInfo.get("id")).intValue()); menuInfo.put("userId", loginUserVO.getUserid()); List currAndHigherMenuList = menuService.selectListWithHigher(menuVO); @@ -140,8 +138,7 @@ public class CommonAop { // e.printStackTrace(); } - Object proc = thisJoinPoint.proceed(); - return proc; + return thisJoinPoint.proceed(); } /** 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 55fa092..68ff19e 100644 --- a/src/main/java/kcg/faics/cmmn/service/impl/MenuServiceImpl.java +++ b/src/main/java/kcg/faics/cmmn/service/impl/MenuServiceImpl.java @@ -84,12 +84,11 @@ public class MenuServiceImpl implements MenuService { public HashMap getMenuInfo(final HashMap menu) { HashMap paramMenu = menuMapper.getMenuInfo(menu); - - int depth = ((BigDecimal) paramMenu.get("DEPTH")).intValue(); - if (depth < 3) { + + if ((Double)paramMenu.get("depth") < 3.0d) { return paramMenu; } else { - menu.put("id", ((BigDecimal) paramMenu.get("PARENT")).intValue()); + menu.put("id", ((BigDecimal) paramMenu.get("parent")).intValue()); return menuMapper.getMenuInfoById(menu); } } diff --git a/src/main/resources/sqlmapper/mappers/cmmn/menu.xml b/src/main/resources/sqlmapper/mappers/cmmn/menu.xml index 67fcc6e..ac2245c 100644 --- a/src/main/resources/sqlmapper/mappers/cmmn/menu.xml +++ b/src/main/resources/sqlmapper/mappers/cmmn/menu.xml @@ -97,25 +97,17 @@