Merge branch 'jsshin' into develop

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

@@ -226,8 +226,10 @@
 		    <if test="encodedBirthYmd != null and encodedBirthYmd != ''">
 		    , BIRTH_YMD = #{encodedBirthYmd}
 		    </if>
-		    <if test="encodedEmail != null and encodedEmail != ''">
+		    <if test='emailModifyYn == "Y"'>
+			    <if test="encodedEmail != null and encodedEmail != ''">
 		    , EMAIL = #{encodedEmail}
+		         </if>
 		    </if>
 		    <if test="managedRsn != null and managedRsn != ''">
 		    , MANAGED_DT = CASE WHEN MANAGED_RSN = #{managedRsn}

src/main/webapp/WEB-INF/views/customer/CustomerDetailForm.html

@@ -1374,6 +1374,7 @@
 		$(formId + ' input[name=email]').val(emailId + '@' + emailDomain);
 
 		if (orgData.maskingEmail === $(formId + ' input[name=email]').val()) {
+			$(formId + ' input[name=emailModifyYn]').val('N');
 			return true;
 		} else {
 			if (!gagajf.testRegexp($(formId + ' input[name=email]'), /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/)) {
@@ -1381,7 +1382,6 @@
 			}
 			// 수정되었으면 Y로 변경
 			if (result) {
-				console.log('result', result);
 				$(formId + ' input[name=emailModifyYn]').val('Y');
 			}
 		}