diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java index 125c9c17..08566f62 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -1942,7 +1942,6 @@ public class EgovLoginController { modelAndView.addObject("status", "fail"); modelAndView.addObject("msg", message); return modelAndView; - } } } @@ -1953,20 +1952,14 @@ public class EgovLoginController { loginSmiChkVO.setIp(EgovClntInfo.getClntIP(request)); loginSmiChkVO.setPassword(password); loginSmiChkVO.setUserSe("GNR"); - loginSmiChkVO.setStatusAll("Y"); // 신청대기중인 사용자까지 조회 - loginSmiChkVO.setEmplyrSttusCode("B"); // 신청대기중인 사용자까지 조회 + loginSmiChkVO.setStatusAll("Y"); // 신청대기중인 사용자까지 조회 + loginSmiChkVO.setEmplyrSttusCode("B"); // 회원상태 B : 회원 탈퇴정보 LoginVO smiResultVO = loginService.actionLoginCmpChk(loginSmiChkVO); if(null != smiResultVO.getId()) { - MberManageVO spamMberManageVO = new MberManageVO(); - spamMberManageVO.setMberId(loginVO.getId()); - MberManageVO spamMemberInfoVO = mberManageService.selectSpamMemberInfo(spamMberManageVO); - if(null != spamMemberInfoVO) { - String message = "신청대기중인 상태입니다."; - - modelAndView.addObject("status", "fail"); - modelAndView.addObject("msg", message); - return modelAndView; - } + modelAndView.addObject("returnType", "C"); + modelAndView.addObject("mberId", loginVO.getId()); + modelAndView.addObject("status", "fail"); + return modelAndView; } resultVO = loginService.actionLogin(loginVO); LoginVO passMissVO = loginService.selectPassMiss(loginVO); diff --git a/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp b/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp index 839a1357..9442511e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp @@ -219,6 +219,10 @@ function actionLogin(){ document.cmpChangeForm.mberId.value = data.mberId; document.cmpChangeForm.action=""; document.cmpChangeForm.submit(); + }else if (data.returnType == "C"){ + document.cmpChangeForm.mberId.value = data.mberId; + document.cmpChangeForm.action=""; + document.cmpChangeForm.submit(); }else{ $("#ret_msg").show(); $("#ret_msg_info").html(''+data.msg);