From 0796a39da91013ab0c8a3f74753723127815a148 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 26 Dec 2022 14:35:15 +0900
Subject: [PATCH] =?UTF-8?q?2022-12-26=2014:35=20=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=84=B1=EB=8A=A5=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/uat/uia/web/EgovLoginController.java  | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java
index 5b9e3a87..f17631bd 100644
--- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java
+++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java
@@ -538,21 +538,37 @@ public class EgovLoginController {
         loginVO.setPassword(loginVO.getPassword());
 
         // 사용자일 경우 로그인 안되게
-        if (null == loginService.getUserAuth(loginVO)) { // 아이디 없음.
+        LoginVO	loginInfo	=	loginService.getUserAuth(loginVO);
+        String s_loginInfo_getAuthority	=	"";
+        try {
+        	s_loginInfo_getAuthority	=	loginInfo.getAuthority();
+        	
+        }catch(Exception ex) {
+        	System.out.println(ex.getMessage());
+        	//ex.printStackTrace();        	
+        	//System.out.println(ex.prin.printStackTrace());
+        }
+        
+        //if (null == loginService.getUserAuth(loginVO)) { // 아이디 없음.
+        if (null == loginInfo) { // 아이디 없음.
 //	    	initRsa(request);
             model.addAttribute("message", egovMessageSource.getMessage("fail.common.login"));
             return "uat/uia/EgovLoginUsr";
         } else {
-            if ("ROLE_USER_MEMBER".equals(loginService.getUserAuth(loginVO).getAuthority())) { // 일반사용자 로그인
+            //if ("ROLE_USER_MEMBER".equals(loginService.getUserAuth(loginVO).getAuthority())) { // 일반사용자 로그인
+           	if ("ROLE_USER_MEMBER".equals(s_loginInfo_getAuthority)) { // 일반사용자 로그인
 //	    		initRsa(request);
                 model.addAttribute("message", egovMessageSource.getMessage("fail.common.login"));
                 return "uat/uia/EgovLoginUsr";
-            } else if ("ROLE_USER_MANAGER".equals(loginService.getUserAuth(loginVO).getAuthority())) {
+            //} else if ("ROLE_USER_MANAGER".equals(loginService.getUserAuth(loginVO).getAuthority())) {
+           	} else if ("ROLE_USER_MANAGER".equals(s_loginInfo_getAuthority)) {
                 model.addAttribute("message", egovMessageSource.getMessage("fail.common.login"));
                 return "uat/uia/EgovLoginUsr";
             }
         }
 
+        
+        
         // 1. 로그인 처리
         LoginVO resultVO = loginService.actionLogin(loginVO);
         
@@ -607,9 +623,19 @@ public class EgovLoginController {
 			} 
 		}
         
+		//중복 호출 제거
+        LoginVO	loginGetUserAuth	=	loginService.getUserAuth(resultVO);        
+        
+        if (loginGetUserAuth != null) {
+        	resultVO.setAuthority(loginGetUserAuth.getAuthority());
+        }
+        
+        /*
         if (loginService.getUserAuth(resultVO) != null) {
         	resultVO.setAuthority(loginService.getUserAuth(resultVO).getAuthority());
         }
+        */
+
         
         if (null == resultVO.getId()) { // 로그인 실패
             loginService.updatePassMissPlus(loginVO);