From 49e50ef8ca8c2af34dd1763e4b3b022591868e62 Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Wed, 17 Nov 2021 14:53:28 +0900
Subject: [PATCH] =?UTF-8?q?login=20=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/nlib/user/web/MemberController.java      |  2 +-
 .../egovframework/mapper/nlib/user/LoginDAO_SQL.xml    | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java
index 7c8e9659..bae3a59d 100644
--- a/src/main/java/nlib/user/web/MemberController.java
+++ b/src/main/java/nlib/user/web/MemberController.java
@@ -359,7 +359,7 @@ public class MemberController extends NlibCommonController{
 		
 		String jsessionId = session.getId();
 		OAuthUniversalUser oauthUser = SessionConfig.popNewMemberInfo(jsessionId);
-		if(oauthUser != null && oauthUser.getNlibVO()!=null)
+		if(oauthUser != null && oauthUser.getNlibVO() != null)
 		{
 			//핸드폰인증시 sns제공 번호와 회원가입폼 번호 비교
 			if(!(vo.getMobileNo().equals(oauthUser.getSnsMobileNo())))
diff --git a/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml
index e67fa76a..064581d0 100644
--- a/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml
+++ b/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml
@@ -4,7 +4,6 @@
 <mapper namespace="LoginDAO">
 
  	<select id="selectLoginUserInfo" parameterType="NlibLoginVO" resultType="NlibLoginVO">
- 	    <![CDATA[
 		SELECT
 		          A.MB_INFO_ID
 		        , A.LOGIN_USER_ID
@@ -37,11 +36,16 @@
 		FROM UAC_CLTR_DB.MB_INFO A /* 사용자정보 */
 		JOIN UAC_CLTR_DB.MB_SNS B  /* 사용자 SNS 정보 */
 		ON A.MB_INFO_ID = B.MB_INFO_ID 
-		WHERE A.MB_INFO_ID = #{mbInfoId}
+		WHERE 1=1
+		  <if test='mbInfoId != null'>
+		  AND A.MB_INFO_ID = #{mbInfoId}
+		  </if>
+          <if test='mbInfoId == null'>
+          AND B.SNS_ID = #{snsId} AND B.SNS_TYPE = #{snsType}
+          </if>
 		  AND B.UNLINK_DD IS NULL /* 연동해제건 제외 */
 		  ORDER BY B.REG_DD
 		LIMIT 1	
-		]]>		
  	</select>
  	
  	<select id="selectCouncilInfoByDnsHost" parameterType="String" resultType="HashMap">