From de284166a7148c2faa45ea7eebe9c4d4bd12de71 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 24 May 2023 13:40:19 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=A9=94=EB=89=B4=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EB=B3=80=EC=88=98=EB=AA=85=20=EC=88=98=EC=A0=95(me?= =?UTF-8?q?nuUrl=20->=20menuView)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fims/framework/core/interceptor/MenuIntercepter.java | 2 +- .../sql/mapper/framework/cache/cachemenu-mysql-mapper.xml | 6 +++--- .../sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml | 4 ++-- src/main/webapp/WEB-INF/jsp/include/fims/breadcrumb.jsp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/kr/xit/fims/framework/core/interceptor/MenuIntercepter.java b/src/main/java/kr/xit/fims/framework/core/interceptor/MenuIntercepter.java index 85be37f9..5409d4f5 100644 --- a/src/main/java/kr/xit/fims/framework/core/interceptor/MenuIntercepter.java +++ b/src/main/java/kr/xit/fims/framework/core/interceptor/MenuIntercepter.java @@ -93,7 +93,7 @@ public class MenuIntercepter extends HandlerInterceptorAdapter { for(int i=0; i < allMenuList.size(); i++) { Map mUrlInfo = allMenuList.get(i); - if (Checks.isNotEmpty(mUrlInfo.get("menuUrl")) && mUrlInfo.get("menuUrl").toString().contains(reqPath)) { + if (Checks.isNotEmpty(mUrlInfo.get("menuView")) && mUrlInfo.get("menuView").toString().contains(reqPath)) { String[] arrPath = mUrlInfo.get("menuPath").toString().split("_"); if(arrPath.length > 1){ mUrlInfo.put("secondMenu", arrPath[1]); diff --git a/src/main/resources/sql/mapper/framework/cache/cachemenu-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cache/cachemenu-mysql-mapper.xml index 30de7a64..7395dcdf 100644 --- a/src/main/resources/sql/mapper/framework/cache/cachemenu-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cache/cachemenu-mysql-mapper.xml @@ -7,7 +7,7 @@ SELECT D.menu_id AS "menuSid" , D.menu_name AS "menuName" - , (CASE B.ACTION WHEN '/' THEN '#' ELSE B.ACTION END) AS "menuUrl" + , (CASE B.ACTION WHEN '/' THEN '#' ELSE B.ACTION END) AS "menuView" , D.menu_depth AS "menuDepth" , D.parnt_menu_id AS "parentSid" , D.menu_full_path AS "menuPath" @@ -28,7 +28,7 @@ SELECT D.menu_id AS "menuSid" , D.menu_name AS "menuName" - , (CASE B.ACTION WHEN '/' THEN '#' ELSE B.ACTION END) AS "menuUrl" + , (CASE B.ACTION WHEN '/' THEN '#' ELSE B.ACTION END) AS "menuView" , D.menu_depth AS "menuDepth" , D.parnt_menu_id AS "parentSid" , D.menu_full_path AS "menuPath" @@ -57,7 +57,7 @@ SELECT D.menu_id AS "menuSid" , D.menu_name AS "menuName" - , (CASE B.ACTION WHEN '/' THEN '#' ELSE B.ACTION END) AS "menuUrl" + , (CASE B.ACTION WHEN '/' THEN '#' ELSE B.ACTION END) AS "menuView" , D.menu_depth AS "menuDepth" , D.parnt_menu_id AS "parentSid" , D.menu_full_path AS "menuPath" diff --git a/src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml index bb632602..96264589 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml @@ -37,7 +37,7 @@ SELECT D.MENU_ID AS "menuSid" ,D.MENU_NAME AS "menuName" - ,(SELECT CASE SA.URL WHEN '/' THEN '#' ELSE SA.URL END FROM XIT_PROGRM_LIST SA WHERE B.pgrm_file_nm = SA.pgrm_file_nm) AS "menuUrl" + ,(SELECT CASE SA.URL WHEN '/' THEN '#' ELSE SA.URL END FROM XIT_PROGRM_LIST SA WHERE B.pgrm_file_nm = SA.pgrm_file_nm) AS "menuView" ,D.MENU_DEPTH AS "menuDepth" ,D.PARNT_MENU_ID AS "parentSid" ,D.MENU_FULL_PATH AS "menuPath" @@ -65,7 +65,7 @@ SELECT D.MENU_ID AS "menuSid" ,D.MENU_NAME AS "menuName" - ,(SELECT CASE SA.URL WHEN '/' THEN '#' ELSE SA.URL END FROM XIT_PROGRM_LIST SA WHERE B.pgrm_file_nm = SA.pgrm_file_nm) AS "menuUrl" + ,(SELECT CASE SA.URL WHEN '/' THEN '#' ELSE SA.URL END FROM XIT_PROGRM_LIST SA WHERE B.pgrm_file_nm = SA.pgrm_file_nm) AS "menuView" ,D.MENU_DEPTH AS "menuDepth" ,D.PARNT_MENU_ID AS "parentSid" ,D.MENU_FULL_PATH AS "menuPath" diff --git a/src/main/webapp/WEB-INF/jsp/include/fims/breadcrumb.jsp b/src/main/webapp/WEB-INF/jsp/include/fims/breadcrumb.jsp index 0eb11bef..310ae39a 100644 --- a/src/main/webapp/WEB-INF/jsp/include/fims/breadcrumb.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/fims/breadcrumb.jsp @@ -10,7 +10,7 @@ - +