From c5fc7dc061d4ca75f90793571ecf0a22703b860f Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Fri, 10 Jan 2025 17:02:06 +0900
Subject: [PATCH] Merge branch 'tolag3'

---
 .../java/kcc/com/cmm/web/EgovComUtlController.java |  2 +-
 .../java/seed/com/gtm/base/BaseController.java     | 14 ++++++++++++++
 .../java/seed/com/gtm/cases/CaseController.java    |  7 ++++---
 .../webapp/WEB-INF/views/_common/_js/seed.tab.js   |  3 ++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/kcc/com/cmm/web/EgovComUtlController.java b/src/main/java/kcc/com/cmm/web/EgovComUtlController.java
index 9e36879d..ee128e56 100644
--- a/src/main/java/kcc/com/cmm/web/EgovComUtlController.java
+++ b/src/main/java/kcc/com/cmm/web/EgovComUtlController.java
@@ -101,7 +101,7 @@ public class EgovComUtlController {
 	 * 상단 링크시 파라미터 삭제 후 페이지 호출
 	 */
 	@RequestMapping(value = "/EgovTopPageLink.do")
-	public String EgovTopPageLink(@RequestParam("link") String linkPage , @RequestParam("baseMenuNo") String baseMenuNo ,
+	public String EgovTopPageLink(@RequestParam(value = "link", required = false) String linkPage , @RequestParam(value = "baseMenuNo", required = false) String baseMenuNo ,
 			ModelMap model, RedirectAttributes redirectAttributes, HttpServletRequest req, HttpSession session)
 			 throws Exception{
 		String link = linkPage;
diff --git a/src/main/java/seed/com/gtm/base/BaseController.java b/src/main/java/seed/com/gtm/base/BaseController.java
index 3cad7da3..f187078d 100644
--- a/src/main/java/seed/com/gtm/base/BaseController.java
+++ b/src/main/java/seed/com/gtm/base/BaseController.java
@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.clipsoft.clipreport.export.option.PDFOption;
@@ -863,4 +864,17 @@ public class BaseController {
 		
 //		return "";
 	}
+	@RequestMapping(value = "/gtm/case/trublend/trublendView/trublendDocPop.do")
+	public String trublendDocPop(
+							HttpServletRequest request
+							, HttpServletResponse response
+							, @RequestParam Map<String, Object> map
+							, HttpSession session
+						) throws Exception {
+		
+		
+		System.out.println("tes");
+	
+		return "/com/pdf/pdfList";
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/seed/com/gtm/cases/CaseController.java b/src/main/java/seed/com/gtm/cases/CaseController.java
index 4394d005..ad35fa1a 100644
--- a/src/main/java/seed/com/gtm/cases/CaseController.java
+++ b/src/main/java/seed/com/gtm/cases/CaseController.java
@@ -97,9 +97,10 @@ public class CaseController {
 	
 	@RequestMapping(value = "/gtm/login.do")
 	public ModelAndView getManagerLayOutPage(HttpServletRequest request,
-			HttpSession session, Map<String, Object> map,
-			@PathVariable(value="pageFolder") String pageFolder,
-			@PathVariable(value="pageName") String pageName)throws Exception{
+			HttpSession session, Map<String, Object> map
+			//,			@PathVariable(value="pageFolder") String pageFolder,
+//			@PathVariable(value="pageName") String pageName
+			)throws Exception{
 		
 		return new ModelAndView("redirect:/uat/uia/EgovLoginUsr.do");		
 	}
diff --git a/src/main/webapp/WEB-INF/views/_common/_js/seed.tab.js b/src/main/webapp/WEB-INF/views/_common/_js/seed.tab.js
index 97d4ac06..2b39aef0 100644
--- a/src/main/webapp/WEB-INF/views/_common/_js/seed.tab.js
+++ b/src/main/webapp/WEB-INF/views/_common/_js/seed.tab.js
@@ -647,7 +647,8 @@ Array.prototype.unique=function(){var unique=this.reduce(function(a,b){if(a.inde
 		
 			if( !currentElement.length || location.hash.indexOf('undefined') > -1 ){
 				setTimeout(function() {
-					location.href = getBaseURL() + 'login.do';
+					///gtm/case/login.do로 계속 리다이렉트되는 에러로 주석 처리_이준호_250110
+//					location.href = getBaseURL() + 'login.do';
 				}, 1000);
 			}
 			else {