tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tolag3'

Browse Source
This commit is contained in:
leejunho 2025-01-10 17:02:06 +09:00
parent 9bb8bef0d6
commit c5fc7dc061
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcc/com/cmm/web/EgovComUtlController.java
View File

@ -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;

14
src/main/java/seed/com/gtm/base/BaseController.java
View File

@ -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";
}
}

7
src/main/java/seed/com/gtm/cases/CaseController.java
View File

@ -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");
}

3
src/main/webapp/WEB-INF/views/_common/_js/seed.tab.js
View File

@ -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 {