diff --git a/src/main/java/kcc/let/uat/uia/web/SSOValid.java b/src/main/java/kcc/let/uat/uia/web/SSOValid.java index 11e51ff8..ce4ed004 100644 --- a/src/main/java/kcc/let/uat/uia/web/SSOValid.java +++ b/src/main/java/kcc/let/uat/uia/web/SSOValid.java @@ -141,23 +141,24 @@ public class SSOValid implements Filter { SsoLoginVO ssoLoginVO = new SsoLoginVO(); ssoLoginVO = (SsoLoginVO)session.getAttribute("SSOLoginVO"); - //LoginVO 세션 정보 취득 - LoginVO loginVO = new LoginVO(); - loginVO = (LoginVO)session.getAttribute("LoginVO"); + try { if(ssoLoginVO != null) { if("N".equals(ssoLoginVO.getOtherUser())){ + //LoginVO 세션 정보 취득 +// LoginVO loginVO = new LoginVO(); +// loginVO = (LoginVO)session.getAttribute("LoginVO"); //SSO 로그인 연계 BandiSSOAgent 생성 BandiSSOAgent agent = new BandiSSOAgent(ssoUri, clientId, clientSecret, scope); HashMap tokenValid = agent.tokenValid(ssoLoginVO.getAccess_token(), client_ip); if(tokenValid.get("error").equals("0000")) { - if(loginVO == null) { +// if(loginVO == null) { // HttpServletResponse httpServletResponse = (HttpServletResponse) response; // httpServletResponse.sendRedirect("/web/user/login/actionSecurityLogin.do"); - } +// } }else { //SSO 로그아웃 요청 agent.logout(ssoLoginVO.getAccess_token(), client_ip); @@ -180,6 +181,10 @@ public class SSOValid implements Filter { } } }else { + //LoginVO 세션 정보 취득 + LoginVO loginVO = new LoginVO(); + loginVO = (LoginVO)session.getAttribute("LoginVO"); + if(loginVO != null) { LoginVO user = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); diff --git a/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Mysql.xml index 679dce02..9de7e19d 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/pwm/PopupManage_SQL_Mysql.xml @@ -53,12 +53,14 @@ A.STOPVEW_SETUP_AT, A.NTCE_AT, DATE_FORMAT(A.FRST_REGIST_PNTTM,'%Y-%m-%d') FRST_REGIST_PNTTM, - (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = A.FRST_REGISTER_ID) FRST_REGISTER_NM, + t1.USER_NM AS FRST_REGISTER_NM, A.POPUP_TYPE, A.SCROLL_TYPE, A.NTT_CN, A.SORT_NUM FROM COMTNPOPUPMANAGE A + LEFT JOIN LETTNEMPLYRINFO t1 + ON t1.ESNTL_ID = A.FRST_REGISTER_ID WHERE 1=1 AND A.NTCE_AT = 'Y' AND DATE_FORMAT(NOW(),'%Y%m%d%H%i') >= NTCE_BGNDE @@ -291,9 +293,11 @@ USE_YN, SORT, DATE_FORMAT(REGDT, '%Y-%m-%d %h:%m:%s') REGDT, - (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = REGISTER_ID) REGISTER_ID, + USER_NM AS REGISTER_ID, SITE_ID FROM POPUPZONE MB + LEFT JOIN LETTNEMPLYRINFO t1 + ON t1.ESNTL_ID = MB.REGISTER_ID WHERE DEL = '0' ]]> @@ -519,9 +523,11 @@ SORT, MAZ_NM, USE_YN, - (SELECT USER_NM FROM LETTNEMPLYRINFO WHERE ESNTL_ID = REGISTER_ID) REGISTER_ID , + t1.USER_NM AS REGISTER_ID, DEVICETYPE FROM MAINZONE MB + LEFT JOIN LETTNEMPLYRINFO t1 + ON t1.ESNTL_ID = MB.REGISTER_ID WHERE 1=1 ]]>