From 2e82093d5c71d4593e5a78b429169c0af87864b8 Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Wed, 3 Jul 2024 11:08:13 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B5=9C=EA=B3=A0=EA=B4=80=EB=A6=AC=EC=9E=90?=
 =?UTF-8?q?=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/fims/mngt/select-sgg.jsp |  4 ++--
 src/main/webapp/WEB-INF/jsp/include/top.jsp     | 17 +++++++----------
 src/main/webapp/WEB-INF/jsp/index.jsp           | 10 +++++++++-
 src/main/webapp/WEB-INF/jsp/login.jsp           |  4 ++++
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/select-sgg.jsp b/src/main/webapp/WEB-INF/jsp/fims/mngt/select-sgg.jsp
index 4a0eea0c..f6a16f22 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/mngt/select-sgg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/mngt/select-sgg.jsp
@@ -20,8 +20,8 @@
 </div>
 <script>
 function fnGoToEditSgg(selected){
-	var sggMainMenuNum = "62";
-	var menuUrl = $("#menus").find("li[data-key='"+sggMainMenuNum+"'] a").attr("onclick").split("'")[1];
+
+	let menuUrl = wctx.url("/mngt/mngt03/010/main.do");
 	
 	let curTabId = getActiveRootTabArea().id;
 	
diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp
index 9b4acb9a..f52a4cd0 100644
--- a/src/main/webapp/WEB-INF/jsp/include/top.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp
@@ -486,22 +486,19 @@ $("#btnFastSearch--top").on( "click", function() {
 $("#fastTerm--top").onEnterPress(fnGlobalFastSearch);
 
 function fnGlobalFastSearch(){
-	var integrationSearchMenuNum = "17";
-	
-	var url = $("#menus").find("li[data-key='"+integrationSearchMenuNum+"'] a").attr("onclick").split("'")[1];
-	if(mainTabs.getDataset().find(i => i.id == integrationSearchMenuNum) != null){
-		mainTabs.close(url);
+
+	var integrationSearchUrl = wctx.url("/sprt/sprt01/010/main.do");
+	if(mainTabs.getDataset().find(i => i.url == integrationSearchUrl) != null){
+		mainTabs.close(integrationSearchUrl);
 	}
-	
-	var itegrationSearchMenu = $("#menus").find("li[data-key='"+integrationSearchMenuNum+"'] a")[0];
-	
+		
 	if($("#fastTerm--top").val() != ""){
 		var fastTerm = $("#fastTerm--top").val();
 		var fastBy = $("#fastBy--top").val();
 		
-		openMenu(url+"?fastBy="+fastBy+"&fastTerm="+fastTerm);
+		openMenu(integrationSearchUrl+"?fastBy="+fastBy+"&fastTerm="+fastTerm);
 	} else {
-		openMenu(url);
+		openMenu(integrationSearchUrl);
 	}
 }
 
diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp
index d8d422bf..c1244141 100644
--- a/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -370,7 +370,15 @@
    				//사용하지 않는 연계와 관련된 메뉴 제거
    				//새올민원 관련 메뉴 제거
    				if(SYS_LINK_INFO.CVLCPT_LINK_SE_CD != '01'){
-   					$("ul[id='menus']").find("li[class='menu-item'][data-key='22']").remove();
+   					var seallMenuUrl = wctx.url("/cvlc/cvlc04/010/main.do");
+   					$("ul[id='menus']").find("li[class='menu-item']").each(function(){
+						if($(this).children("a[onclick]").length > 0){
+							let oc = $(this).children("a[onclick]").attr("onclick").split("'");
+							if(oc.length == 3 && oc[1] == seallMenuUrl){
+								$(this).remove();
+							}
+						}
+   					});
    				}
    				
    				//사용자별 선택가능한 업무 렌더링
diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp
index 722b748e..0468fc4c 100644
--- a/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -119,6 +119,10 @@ function login() {
 		rememberCredentials: $("#remember").prop("checked")
 	};
 	
+	if(params.orgID == "default"){
+		params.orgID = "";
+	}
+	
 	json.post({
 		url:wctx.url("/login.do"),
 		data:params,