From aa4c298b14ab7b18756ed1cccb99d8421feb0c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Tue, 5 Apr 2022 10:11:52 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=83=80?=
 =?UTF-8?q?=EC=9D=B4=ED=8B=80=20=EC=BF=BC=EB=A6=AC=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/kcg/faics/cmmn/aop/CommonAop.java    | 11 +++----
 .../cmmn/service/impl/MenuServiceImpl.java    |  7 ++---
 .../resources/sqlmapper/mappers/cmmn/menu.xml | 30 +++++++------------
 3 files changed, 18 insertions(+), 30 deletions(-)

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<String, Object> 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<MenuVO> 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<String, Object> getMenuInfo(final HashMap<String, Object> menu) {
 		
 		HashMap<String, Object> 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 @@
 	</select>
 <!---->
 	<select id="Menu.getMenuInfo" parameterType="map" resultType="map">
-	<![CDATA[
-		SELECT * FROM (
-			SELECT
-			  *
-			FROM
-			  T_MENU
-			WHERE
-				URL_GROUP = #{group} AND
-				URL = #{url}
-	]]>
-			<if test="boardId != null and boardId != ''"><![CDATA[
-				AND BOARD_ID = #{boardId}
-			]]></if>
-			<if test="query != null and query != ''"><![CDATA[
-				AND URL_QUERY = #{query}
-			]]></if>
-	<![CDATA[
-		) WHERE ROWNUM = 1
-	]]>
+    SELECT *
+    FROM T_MENU
+    WHERE URL_GROUP = #{group}
+      AND URL = #{url}
+      <if test="boardId != null and boardId != ''">
+          AND BOARD_ID = #{boardId}
+      </if>
+      <if test="query != null and query != ''">
+          AND URL_QUERY = #{query}
+      </if>
+    limit 1
 	</select>
 	
 	<select id="Menu.getMenuInfoById" parameterType="map" resultType="map">