From a53b2e0805982500b452596cdfb7d538e6f27554 Mon Sep 17 00:00:00 2001
From: ijunho <tolag3@gmail.com>
Date: Mon, 11 Aug 2025 15:28:34 +0900
Subject: [PATCH] =?UTF-8?q?[=EC=82=AC=EC=9A=A9=EC=9E=90]=20=EB=AC=B8?=
 =?UTF-8?q?=EC=9E=90=EC=A0=84=EC=86=A1=20>=20=EC=A3=BC=EC=86=8C=EB=A1=9D?=
 =?UTF-8?q?=EC=97=90=20=EB=93=B1=EB=A1=9D=20=EC=8B=9C=20=EA=B8=B0=EC=A1=B4?=
 =?UTF-8?q?=20=ED=9C=B4=EB=8C=80=ED=8F=B0=EB=B2=88=ED=98=B8=20=EC=A4=91?=
 =?UTF-8?q?=EB=B3=B5=20=EC=A0=95=EC=A0=9C=20=EB=B6=88=EA=B0=80=20=EB=B0=8F?=
 =?UTF-8?q?=20=EB=93=B1=EB=A1=9D=EC=86=8D=EB=8F=84=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=ED=99=95=EC=9D=B8=EC=9A=94=EC=B2=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

http://pms.iten.co.kr:9999/issues/5374
---
 .../sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml    | 60 +++++++++----------
 .../webapp/WEB-INF/jsp/web/addr/AddrList.jsp  | 11 ++--
 2 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml
index a20ea414..e2447cef 100644
--- a/src/main/resources/egovframework/sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/mjo/addr/Addr_SQL_Mysql.xml
@@ -569,10 +569,8 @@
 			on A.ADDR_GRP_ID = mag.ADDR_GRP_ID 
 		WHERE
 			A.MBER_ID = #mberId#
-			AND (A.RECV_STATUS = 'Y'
-				or A.RECV_STATUS = 'S'
-				or A.RECV_STATUS is null)
-			AND mag.DELETE_YN = 'N'
+			AND (A.RECV_STATUS IN ('Y', 'S') OR A.RECV_STATUS IS NULL)
+			AND (A.ADDR_GRP_ID IS NULL OR MAG.DELETE_YN = 'N')
 	</select>
 	
 	<!-- 주소록 상세  조회 -->
@@ -1354,34 +1352,32 @@
 			, BOOKMARK
 			, RECV_STATUS
 		) 
-		SELECT 
-			ADDR_GRP_ID
-			, MBER_ID
-			, ADDR_NM
-			, ADDR_PHONE_NO
-			, ADDR_INFO1
-			, ADDR_INFO2
-			, ADDR_INFO3
-			, ADDR_INFO4
-			, ADDR_COMMENT
-			, FRST_REGIST_PNTTM
-			, FRST_REGISTER_ID
-			, LAST_UPDT_PNTTM
-			, LAST_UPDUSR_ID
-			, DELETE_YN
-			, BOOKMARK
-			, RECV_STATUS
-		FROM TEMP_MJ_ADDR
-		WHERE MBER_ID = #mberId#
-			AND ADDR_GRP_ID = #addrGrpId# 
-			AND BOOKMARK = #bookmark# 
-			AND ADDR_PHONE_NO NOT IN 
-			(
-				SELECT ADDR_PHONE_NO FROM MJ_ADDR 
-				WHERE MBER_ID = #mberId#
-					AND ADDR_GRP_ID = #addrGrpId# 
-					AND BOOKMARK = #bookmark# 
-			)  
+		SELECT t.ADDR_GRP_ID,
+		       t.MBER_ID,
+		       t.ADDR_NM,
+		       FN_GETHYPHEN(t.ADDR_PHONE_NO),
+		       t.ADDR_INFO1,
+		       t.ADDR_INFO2,
+		       t.ADDR_INFO3,
+		       t.ADDR_INFO4,
+		       t.ADDR_COMMENT,
+		       t.FRST_REGIST_PNTTM,
+		       t.FRST_REGISTER_ID,
+		       t.LAST_UPDT_PNTTM,
+		       t.LAST_UPDUSR_ID,
+		       t.DELETE_YN,
+		       t.BOOKMARK,
+		       t.RECV_STATUS
+		FROM TEMP_MJ_ADDR AS t
+		         LEFT JOIN MJ_ADDR AS m
+		                   ON m.MBER_ID = t.MBER_ID
+		                       AND m.ADDR_GRP_ID = t.ADDR_GRP_ID
+		                       AND m.BOOKMARK = t.BOOKMARK
+		                       AND replace(m.ADDR_PHONE_NO, '-', '') = replace(t.ADDR_PHONE_NO, '-', '')
+		WHERE t.MBER_ID =     #mberId#
+		  AND t.ADDR_GRP_ID = #addrGrpId#
+		  AND t.BOOKMARK =    #bookmark#
+		  AND m.MBER_ID IS NULL
 	</insert>	
 		
 	
diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp
index a6d05299..47b8716c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp
@@ -112,16 +112,17 @@ function insertAddrAjax() {
 	//	return;
 	//}
 	
-	if(!checkHpNum(form.addrPhoneNo.value)){//휴대폰 유효성 검사
-		if(!checkNorPhoneNum(form.addrPhoneNo.value)){//일반전화 유효성 검사
-			
+	if(!isValidPhoneNumber(form.addrPhoneNo.value)){//일반전화 유효성 검사
+		const formattedNumber =formatPhoneNumber(form.addrPhoneNo.value); // 번호 표준화
+		if(!isValidPhoneNumber(formattedNumber)){
 			alert("잘못된 휴대폰번호 또는 일반전화 번호 입니다.");
 			return false;
-			
 		}
-		
 	}
 	
+	//휴대폰번호 포맷 맞추기
+	form.addrPhoneNo.value = formatPhoneNumber(form.addrPhoneNo.value);
+	
 	var data = new FormData(form);
 
 	$.ajax({