tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://hylee@vcs.iten.co.kr:9999/hylee/mjon_git

Browse Source
This commit is contained in:
hehihoho3@gmail.com 2024-12-24 16:29:59 +09:00
commit 5aa703d631
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/itn/let/uat/uia/web/EgovLoginController.java
View File

@ -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);

4
src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp
View File

@ -219,6 +219,10 @@ function actionLogin(){
document.cmpChangeForm.mberId.value = data.mberId;
document.cmpChangeForm.action="<c:url value='/web/user/login/membershipAttachDocBefore.do'/>";
document.cmpChangeForm.submit();
}else if (data.returnType == "C"){
document.cmpChangeForm.mberId.value = data.mberId;
document.cmpChangeForm.action="<c:url value='/web/user/login/loginRestrictionUse.do'/>";
document.cmpChangeForm.submit();
}else{
$("#ret_msg").show();
$("#ret_msg_info").html('<i></i>'+data.msg);