From 33b6a433e92a20d689e217105b65ef161af2c670 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Thu, 8 Feb 2024 10:57:17 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EC=86=8C=EB=A1=9D=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=20>=20=EC=88=98=EC=8B=A0=EA=B1=B0=EB=B6=80=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EC=A4=91=EB=B3=B5=20=EC=A0=9C=EA=B1=B0=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=20-=20=EC=97=91=EC=85=80=20=EB=B6=88=EB=9F=AC?=
 =?UTF-8?q?=EC=98=A4=EA=B8=B0=20=ED=9B=84=20=EB=93=B1=EB=A1=9D=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EC=84=A0=ED=83=9D=ED=95=98=EC=97=AC=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=ED=95=A0=EB=95=8C=20=EC=A4=91=EB=B3=B5=20=EC=88=98?=
 =?UTF-8?q?=EC=8B=A0=EB=B2=88=ED=98=B8=EB=8A=94=20=EC=A0=9C=EC=99=B8?=
 =?UTF-8?q?=ED=95=98=EA=B3=A0=20=EC=A0=80=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mjo/block/service/impl/MjonBlockDAO.java    |  5 +++++
 .../service/impl/MjonBlockServiceImpl.java      | 17 +++++++++++++++--
 .../sqlmap/let/mjo/block/Block_SQL_Mysql.xml    | 14 ++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/main/java/itn/let/mjo/block/service/impl/MjonBlockDAO.java b/src/main/java/itn/let/mjo/block/service/impl/MjonBlockDAO.java
index 475dabe1..d2057977 100644
--- a/src/main/java/itn/let/mjo/block/service/impl/MjonBlockDAO.java
+++ b/src/main/java/itn/let/mjo/block/service/impl/MjonBlockDAO.java
@@ -19,6 +19,11 @@ public class MjonBlockDAO extends EgovAbstractDAO {
 		return (List<MjonBlockVO>)list("MjonBlockDAO.selectBlockList", blockVO);
 	}
 	
+	@SuppressWarnings("unchecked")
+	public List<String> selectBlockPhoneList(MjonBlockVO blockVO) throws Exception{
+		return (List<String>)list("MjonBlockDAO.selectBlockPhoneList", blockVO);
+	}
+	
 	@SuppressWarnings("unchecked")
 	public List<MjonBlockVO> selectAdmBlockList(MjonBlockVO blockVO) throws Exception{
 		return (List<MjonBlockVO>)list("MjonBlockDAO.selectAdmBlockList", blockVO);
diff --git a/src/main/java/itn/let/mjo/block/service/impl/MjonBlockServiceImpl.java b/src/main/java/itn/let/mjo/block/service/impl/MjonBlockServiceImpl.java
index 22e79c65..4227dc15 100644
--- a/src/main/java/itn/let/mjo/block/service/impl/MjonBlockServiceImpl.java
+++ b/src/main/java/itn/let/mjo/block/service/impl/MjonBlockServiceImpl.java
@@ -1,6 +1,5 @@
 package itn.let.mjo.block.service.impl;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -57,9 +56,23 @@ public class MjonBlockServiceImpl extends EgovAbstractServiceImpl implements Mjo
 	@Override
 	public void insertBlockList(MjonBlockVO mjonBlockVO) throws Exception {
 		
-		List<MjonBlockVO> blockList = new ArrayList<MjonBlockVO>();
+		/*
+		 * 수신거부 목록 신규 등록시 기존 등록 정보와 중복 체크
+		 * 2024.02.07 우영두 수정
+		 * */
+		MjonBlockVO blockVO = new MjonBlockVO();
+		blockVO.setUserId(mjonBlockVO.getUserId());
+		blockVO.setBlockType(mjonBlockVO.getBlockType());
+		List<String> blockPhoneList = blockDAO.selectBlockPhoneList(blockVO);;
 		
     	for(int i=0; i < mjonBlockVO.getPhoneList().length; i++) {
+    		
+    		if(blockPhoneList.size() > 0) {
+    			if(blockPhoneList.contains(mjonBlockVO.getPhoneList()[i])) {
+    				continue;
+    			}
+    		}
+    		
     		mjonBlockVO.setBlockId(idgenBlockId.getNextStringId());
     		mjonBlockVO.setPhone(mjonBlockVO.getPhoneList()[i].trim().replaceAll("§", ","));
 
diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/block/Block_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/block/Block_SQL_Mysql.xml
index a8db9ae4..26722c68 100644
--- a/src/main/resources/egovframework/sqlmap/let/mjo/block/Block_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/mjo/block/Block_SQL_Mysql.xml
@@ -52,6 +52,20 @@
 		LIMIT #recordCountPerPage# OFFSET #firstIndex#
 	</select>
 	
+	
+	<select id="MjonBlockDAO.selectBlockPhoneList" parameterClass="blockVO" resultClass="String">
+		SELECT
+			PHONE				AS phone
+		FROM
+			MJ_BLOCK
+		WHERE
+			1=1
+			AND USER_ID = #userId#
+			AND BLOCK_TYPE = #blockType#
+	    ORDER BY 1=1
+        AND PHONE DESC
+	</select>
+	
 	<!-- 차단 목록 조회(관리자용) -->
 	<select id="MjonBlockDAO.selectAdmBlockList" parameterClass="blockVO" resultClass="blockVO">
 		SELECT