Merge remote-tracking branch 'origin/develop' into jsh77b

src/main/java/com/style24/persistence/mybatis/shop/TsfLogin.xml

@@ -14,11 +14,7 @@
 		     , CUST_STAT                                        /*회원상태*/
 		     , EMAIL                                            /*이메일*/
 		     , #{snsType}                     AS SNS_TYPE       /*SNS유형*/
-		     , CASE WHEN #{snsType} = 'NV' THEN NV_JOIN_ID
-		            WHEN #{snsType} = 'KK' THEN KK_JOIN_ID
-		            WHEN #{snsType} = 'YS' THEN YS_JOIN_ID
-		            ELSE ''
-		       END                            AS SNS_JOIN_ID    /*SNS가입ID*/
+		     , ''                             AS JOIN_ID         /*SNS가입ID*/
 		     , IFNULL((SELECT LOGIN_FAIL_CNT
 		               FROM   TB_LOGIN_FAIL
 		               WHERE  CUST_ID = #{custId}
@@ -29,13 +25,10 @@
 		WHERE  1 = 1
 		<choose>
 		    <when test="snsType == 'NV'"> <!-- SNS로그인:네이버 -->
-		AND    NV_JOIN_ID = #{custId}
 		    </when>
 		    <when test="snsType == 'KK'"> <!-- SNS로그인:카카오 -->
-		AND    KK_JOIN_ID = #{custId}
 		    </when>
 		    <when test="snsType == 'YS'"> <!-- SNS로그인:YES24 -->
-		AND    YS_JOIN_ID = #{custId}
 		    </when>
 		    <otherwise> <!-- 일반로그인 -->
 		AND    CUST_ID = #{custId}