From a823092947b3f2cf324dbee01163d26a00c0f2c3 Mon Sep 17 00:00:00 2001 From: ijunho Date: Tue, 11 Nov 2025 16:17:37 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=88=EB=B0=A9=EA=B5=90=EC=9C=A1=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cop/bbs/web/EgovBBSManageController.java | 21 ++++++++++++++++--- src/main/java/kcc/web/MainController.java | 3 +-- .../mnu/mpm/EgovMainMenu_SQL_Postgresql.xml | 2 +- .../jsp/cop/bbs/EgovBoardMstrRegist.jsp | 4 ++-- .../WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp | 4 ++-- .../WEB-INF/jsp/web/com/webCommonNaviWrap.jsp | 7 ++++++- .../jsp/web/cop/bbs/EgovNoticeList.jsp | 20 +++++++++++++++++- .../jsp/web/cop/bbs/EgovNoticeRegist.jsp | 4 ++-- .../jsp/web/cop/bbs/EgovNoticeUpdt.jsp | 2 +- .../jsp/web/main/mainPage_bak_250915.jsp | 2 +- 10 files changed, 53 insertions(+), 16 deletions(-) diff --git a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java index f0afd11c..cd02e070 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java @@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import kcc.com.utl.user.service.CheckLoginUtil; import org.apache.commons.lang3.ArrayUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; @@ -163,6 +164,10 @@ public class EgovBBSManageController { //알림 @Resource(name = "iTNotiUtil") private ITNotiUtil iTNotiUtil; + + // 로그인 체크 util + @Resource(name = "checkLoginUtil") + private CheckLoginUtil checkLoginUtil; private static final Logger LOGGER = LoggerFactory.getLogger(EgovBBSManageController.class); @@ -1487,14 +1492,24 @@ public class EgovBBSManageController { BoardMasterVO brdMstrVO , RedirectAttributes redirectAttributes ) throws Exception { - SsoLoginVO ssoLoginVO = new SsoLoginVO(); + /*SsoLoginVO ssoLoginVO = new SsoLoginVO(); if(null != request.getSession().getAttribute("SSOLoginVO")) { ssoLoginVO = (SsoLoginVO) request.getSession().getAttribute("SSOLoginVO"); boardVO.setNtcrId(ssoLoginVO.getMembId()); boardVO.setNtcrNm(ssoLoginVO.getMembName()); }else { return "redirect:/"; - } + }*/ + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + if (loginVO == null || ssoLoginVO == null) { + //이전 url 처리(beforeSiteUrl)_이준호_220228추가 + return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + boardVO.setNtcrId(loginVO.getUniqId()); + boardVO.setNtcrNm(loginVO.getMembName()); /*UserVO userVO = new UserVO(); if(null != request.getSession().getAttribute("userVO")) { //세션체크 @@ -2255,7 +2270,7 @@ public class EgovBBSManageController { redirectAttributes.addAttribute("bbsId", boardVO.getBbsId()); redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("success.common.delete")); /*return "redirect:/web/cop/bbsWeb/selectBoardList.do";*/ - return "redirect:/web/cop/bbs/selectBoardList2024.do"; + return "redirect:/web/cop/bbsWeb/selectBoardList.do"; } /** diff --git a/src/main/java/kcc/web/MainController.java b/src/main/java/kcc/web/MainController.java index 4d0b1b72..a662eb4b 100644 --- a/src/main/java/kcc/web/MainController.java +++ b/src/main/java/kcc/web/MainController.java @@ -1450,8 +1450,7 @@ public class MainController { tempMenuManageVO.setSearchCondition("Y"); //현재 메뉴 setViewMenu(request , commandMap , tempMenuManageVO , resultVO , menuManageVO ); - - + String pageUrl = request.getRequestURI().replaceAll(request.getContextPath(), ""); String pageUri = pageUrl.substring(0, pageUrl.lastIndexOf("/")); diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMainMenu_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMainMenu_SQL_Postgresql.xml index 571049bc..dc31f608 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMainMenu_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMainMenu_SQL_Postgresql.xml @@ -132,7 +132,7 @@ '' AS menuCours /*getMenuCours(MENU_NO) AS menuCours*/ FROM LETTNMENUINFO - WHERE CAST(UPPER_MENU_NO AS VARCHAR) = #menuNo#; + WHERE UPPER_MENU_NO = #menuNo#; ]]> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp index b36d810a..b49dbb2b 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp @@ -299,10 +299,10 @@ function fn_egov_inqire_BBSMngInqire() { - + 방문자 글쓰기 사용여부 - diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp index c6374fba..9ea89fdf 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp @@ -369,8 +369,8 @@ $( document ).ready(function() { - - 방문자 글쓰기 사용여부 + + 방문자 글쓰기 사용여부