From 8488ebd9bd60725155925de7ef56bd5fdbd1b4d5 Mon Sep 17 00:00:00 2001
From: wyh <wyh2010@iten.co.kr>
Date: Tue, 24 Dec 2024 14:49:32 +0900
Subject: [PATCH] =?UTF-8?q?=ED=83=88=ED=87=B4=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/uat/uia/web/EgovLoginController.java  | 19 ++++++-------------
 .../jsp/web/login/EgovLoginGnrlUsr.jsp        |  4 ++++
 2 files changed, 10 insertions(+), 13 deletions(-)

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="<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);