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() {