DB컬럼명 변경에 따른 수정

src/main/java/nlib/user/web/LoginController.java

@@ -414,26 +414,13 @@ public class LoginController {
 		//-----------------------------------------------
 		// 로그인 처리
 		//-----------------------------------------------
-		String redirectUrl = loginProc(req, councilCd, oauthUser, councilReturnUrl, model);
-		
-		// 정상 SNS 연동 로그인
-		if(StringUtil.isNotEmpty(redirectUrl)) {
-			return redirectUrl;
-		}
-		
-		return "redirect:" + councilReturnUrl;
-	}
-	
-	public String loginProc(HttpServletRequest req, String councilCd, OAuthUniversalUser oauthUser, String councilReturnUrl, ModelMap model) {
-
-		String jsessionId = req.getSession().getId();
 		String loginResult = loginService.loginCouncilSSO(req, councilCd, oauthUser);
 		
 		// 정상 SNS 연동 로그인
 		if(loginResult == null) {
 			SessionConfig.removeLoginInfo(jsessionId);
 			// 세션에 설정된 redirect 주소 확인
-			return null;
+			return "redirect:" + councilReturnUrl;
 		}
 		
 		// 휴면계좌 
@@ -652,16 +639,6 @@ public class LoginController {
 		nlibLoginVO.setJoinType(oauthUser.getSnsType());
 		int resultCount = loginService.agreeProvInfo(nlibLoginVO);
 		
-		//-----------------------------------------------
-		// 로그인 처리
-		//-----------------------------------------------
-		String redirectUrl = loginProc(req, pCouncilCd, oauthUser, councilReturnUrl, model);
-		
-		// 정상 SNS 연동 로그인
-		if(StringUtil.isNotEmpty(redirectUrl)) {
-			return redirectUrl;
-		}
-		
 		model.addAttribute("resultCount", resultCount);
 		model.addAttribute("oauthUser", oauthUser);
 		model.addAttribute("councilCd", councilCd);

src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml

@@ -7,13 +7,13 @@
 		SELECT
 		      CONTENT_ID
 		    , CONTENT_TYPE
-		    , MNG_COUNCIL_CD
+		    , MNG_ORG_CD
 		    , TITLE
 		    , CONTENT
 		    , BD_ATTACH_FILE_ATTACH_FILE_ID
 		FROM BD_NLIB_CONTENT_PAGE A
 		WHERE A.CONTENT_TYPE = SUBSTRING(#{conDivAndCounCd}, 1, INSTR(#{conDivAndCounCd}, '@') - 1)
-		AND A.MNG_COUNCIL_CD = SUBSTRING(#{conDivAndCounCd}, INSTR(#{conDivAndCounCd}, '@') + 1)
+		AND A.MNG_ORG_CD = SUBSTRING(#{conDivAndCounCd}, INSTR(#{conDivAndCounCd}, '@') + 1)
  	</select>
  	
  	<select id="selectOperationEnv" parameterType="String" resultType="HashMap">

src/main/webapp/WEB-INF/jsp/nlib/login/agreeProvInfo.jsp

@@ -69,8 +69,7 @@
 	- 동의대상 지방문화원 : ${councilCd } ${councilNm }<br />
     - 처리결과 : ${resultCount }<br />
 	<br/>
-	
+    <input type="button" id="continueBtn" name="continueBtn" value="로그인 계속 진행" onclick="javascript: location.href = '${pageContext.request.contextPath}/login/loginCouncilSSO.do';" />
-	<input type="button" id="inactivateBtn" name="" value="홈화면 이동" onclick="javascript: location.href = '${pageContext.request.contextPath}';" />
 </form>
 
 </body>