Merge remote-tracking branch 'origin/master'

2026-03-17 16:54:39 +09:00
parent d1573623a8 82f04ec36e
commit a229a7fec0
5 changed files with 82 additions and 11 deletions
--- a/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml
+++ b/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml
@@ -744,6 +744,9 @@
        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mbrNm) and mbrNm != ''">
 			MBR_NM = #{mbrNm},
        </if>
+        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mbtlnb)">
+            MBTLNB = HEX(AES_ENCRYPT(REPLACE(#{mbtlnb},'-',''), #{secretKey})),
+        </if>
        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(zip) and zip != ''">
 			ZIP = #{zip},
 			ADRES_DV = #{adresDv},
--- a/src/main/webapp/WEB-INF/views/sopmal/mbr/JoinC.jsp
+++ b/src/main/webapp/WEB-INF/views/sopmal/mbr/JoinC.jsp
@@ -635,6 +635,14 @@
 			return;
 		}

+		// console.log("mbtlnb : ",$('#mbtlnb').val());
+		if ($('#mbtlnb').val() === null || $('#mbtlnb').val() === '') {
+			alert('휴대폰 번호를 입력해주세요.');
+			$('#mbtlnb').focus();
+			fn_regist_fail();
+			return;
+		}
+
 		if (!isChkd_Dup) {
 			alert('아이디 중복 확인을 해주세요.');
 			$('#mbrId').focus();
@@ -690,7 +698,7 @@
 			return;
 		}
 		fn_make_brthDe();
-		// fn_make_mbtlnb();
+		fn_make_mbtlnb();
 		var email = $('#email').val();
 		$('[name=email]').val(email.trim());

@@ -1060,6 +1068,13 @@
 									<tbody id="rejoinSelect"></tbody>
 								</table>
 							</div>
+							<div class="signUp__inputBox__item">
+								<div class="signUp__inputBox__itemTitle">휴대전화<span class="required-asterisk">*</span></div>
+								<div class="inputWithBtn">
+									<input type="text" class="input-text full number" id="mbtlnb" title="휴대폰" placeholder="휴대폰번호 입력 (’-’ 없이)" oninput="fn_set_event(this, 'keyup', fn_fmt_telno)" maxlength="13">
+									<input type="hidden" name="mbtlnb">
+								</div>
+							</div>
 							<div class="signUp__inputBox__item">
 								<div class="signUp__inputBox__itemTitle">아이디<span class="required-asterisk">*</span></div>
 								<div class="inputWithBtn">
--- a/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/MbrInfoUpdtU.jsp
+++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/MbrInfoUpdtU.jsp
@@ -54,17 +54,17 @@
 // 			fn_alert_hide_selected();

 			//휴대폰번호 포매팅
-			// if($("#lagacyMbtlnb").text() !== ''){
-			// 	fn_set_lagacyMbtlnb($("#lagacyMbtlnb").text());
-			// }
+			if($("#mbtlnb").val() !== ''){
+				fn_set_lagacyMbtlnb($("#mbtlnb").val());
+			}
 		});

 		/* ********************************************************
 		 * 휴대폰번호 포매팅
 		 ******************************************************** */
 		const fn_set_lagacyMbtlnb = function(mbtlnb) {
-			$("#lagacyMbtlnb").text(fn_format_mbtlnb(mbtlnb));
-			$("#inputMbtlnb").val(mbtlnb);
+			$("#mbtlnb").val(fn_format_mbtlnb(mbtlnb));
+			// $("#inputMbtlnb").val(mbtlnb);
 		}

 		/* ********************************************************
@@ -838,6 +838,15 @@
 			// 	$('#dtlAdres').focus();
 			// 	return;
 			// }
+			if ($('#mbtlnb').val() === null || $('#mbtlnb').val() === '') {
+				alert('휴대폰 번호를 입력해주세요.');
+				$('#mbtlnb').focus();
+				return;
+			}
+
+			let mbtlnb = $('#mbtlnb').val().trim().replace(/-/g, '');
+			$('[name=mbtlnb]').val(mbtlnb);
+			// console.log("mbtlnb : ",mbtlnb);

 			const data = $("#mbrInfoUpdtForm").serialize();
 			if (confirm('회원 정보를 <spring:message code="confirm.common.update"/>')) {
@@ -1195,6 +1204,18 @@
 														</div>
 													</td>
 												</tr>
+												<tr>
+													<th>
+														<span class="editAccount__title">휴대폰번호</span>
+													</th>
+													<td>
+														<div class="inputWithBtn">
+															<input type="text" class="input-text full number update-text" id="mbtlnb" title="휴대폰" placeholder="휴대폰번호 입력 (’-’ 없이)" oninput="fn_set_event(this, 'keyup', fn_fmt_telno)" value="<c:out value="${ resultMap.result.mbtlnb }"/>" maxlength="13">
+															<input type="hidden" name="mbtlnb" value="<c:out value="${resultMap.result.mbtlnb}"/>" id="inputMbtlnb">
+														</div>
+<%--														<p class="signUp__inputBox__alertText" id="mbtlnbAlert">휴대폰 번호를 입력해 주세요.</p>--%>
+													</td>
+												</tr>
 <%--												<tr>--%>
 <%--													<th>--%>
 <%--														<span class="editAccount__title">이메일</span>--%>
--- a/src/main/webapp/WEB-INF/views/sopmal_m/mbr/JoinC.jsp
+++ b/src/main/webapp/WEB-INF/views/sopmal_m/mbr/JoinC.jsp
@@ -669,6 +669,13 @@
 			return;
 		}

+		if($('#mbtlnb').val() === null || $('#mbtlnb').val() === '') {
+			alert('휴대폰 번호를 입력해주세요.');
+			$('#mbtlnb').focus();
+			fn_regist_fail();
+			return;
+		}
+
 		if(!isChkd_Dup) {
 			$('#mbrId').focus();
 			fn_alert_show('아이디 중복 확인을 해주세요.');
@@ -724,7 +731,7 @@
 			return;
 		}
 		fn_make_brthDe();
-		// fn_make_mbtlnb();
+		fn_make_mbtlnb();
 		var email = $('#email').val();
 		$('[name=email]').val(email.trim());

@@ -1105,6 +1112,13 @@
 										<tbody id="rejoinSelect"></tbody>
 									</table>
 								</div>
+								<div class="userForm__inputBox__item">
+									<div class="userForm__inputBox__itemTitle">휴대전화<span class="required-asterisk">*</span></div>
+									<div class="inputWithBtn">
+										<input type="text" class="input-text full number" id="mbtlnb" title="휴대폰" placeholder="휴대폰번호 입력 ('-' 없이)" oninput="fn_set_event(this, 'keyup', fn_fmt_telno)" maxlength="13">
+										<input type="hidden" name="mbtlnb">
+									</div>
+								</div>
 								<div class="userForm__inputBox__item">
 									<div class="userForm__inputBox__itemTitle">아이디<span class="required-asterisk">*</span></div>
 									<div class="inputWithBtn">
--- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/mbr/MbrInfoUpdtU.jsp
+++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/mbr/MbrInfoUpdtU.jsp
@@ -55,9 +55,9 @@
 			e.preventDefault();
 		});
 		//휴대폰번호 포매팅
-		// if($("#mbtlnb").val() !== ''){
-		// 	fn_set_lagacyMbtlnb($("#mbtlnb").val());
-		// }
+		if($("#mbtlnb").val() !== ''){
+			fn_set_lagacyMbtlnb($("#mbtlnb").val());
+		}

 		/* ********************************************************
 		 * 모달 배경화면 스크롤 방지
@@ -106,7 +106,7 @@
 	 ******************************************************** */
 	const fn_set_lagacyMbtlnb = function(mbtlnb) {
 		$("#mbtlnb").val(fn_format_mbtlnb(mbtlnb));
-		$("#inputMbtlnb").val(mbtlnb);
+		// $("#inputMbtlnb").val(mbtlnb);
 	}

 	/* ********************************************************
@@ -923,6 +923,15 @@
 		// 	$('#dtlAdres').focus();
 		// 	return;
 		// }
+		if ($('#mbtlnb').val() === null || $('#mbtlnb').val() === '') {
+			alert('휴대폰 번호를 입력해주세요.');
+			$('#mbtlnb').focus();
+			return;
+		}
+
+		let mbtlnb = $('#mbtlnb').val().trim().replace(/-/g, '');
+		$('[name=mbtlnb]').val(mbtlnb);
+		// console.log("mbtlnb : ",mbtlnb);

 		const data = $("#mbrInfoUpdtForm").serialize();
 		if (confirm('회원 정보를 <spring:message code="confirm.common.update"/>')) {
@@ -1259,6 +1268,15 @@
 										</div>
 									</div>
 								</div>
+								<div class="userForm__inputBox__item">
+									<div class="userForm__inputBox__itemTitle">휴대폰번호<span class="required-asterisk">*</span></div>
+									<div class="inputWithBtn">
+										<input type="text" class="input-text full number" id="mbtlnb" title="휴대폰" placeholder="휴대폰번호 입력 (’-’ 없이)" oninput="fn_set_event(this, 'keyup', fn_fmt_telno)"
+											   value="<c:out value="${ resultMap.result.mbtlnb }"/>" maxlength="13">
+										<input type="hidden" name="mbtlnb" value="<c:out value="${resultMap.result.mbtlnb}"/>" id="inputMbtlnb">
+									</div>
+<%--									<p class="userForm__inputBox__alertText" id="mbtlnbAlert">휴대폰 번호를 입력해 주세요.</p>--%>
+								</div>
 <%--								<div class="userForm__inputBox__item">--%>
 <%--									<div class="userForm__inputBox__itemTitle">이메일<span class="required-asterisk">*</span></div>--%>
 <%--									<div class="inputWithBtn">--%>