From 048097ff417a7c8edaab9f47cc2758db8f133931 Mon Sep 17 00:00:00 2001
From: "DESKTOP-MAVEOS0\\lmh32" <lmh0621@ectech.co.kr>
Date: Mon, 13 Feb 2023 14:30:46 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=9C=EC=8B=A0=EB=B2=88=ED=98=B8=20?=
 =?UTF-8?q?=EB=B0=98=EB=A0=A4=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EC=A3=BC?=
 =?UTF-8?q?=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ez/api/sendNumMgt/SendNumMgtMapper.java   |  2 ++
 .../ez/api/sendNumMgt/SendNumMgtService.java  | 23 ++++++++++++-------
 .../mysql/sendNumMgt/sendNumMgt-mapper.xml    | 11 +++++++++
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtMapper.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtMapper.java
index e785e8d..546bbf0 100644
--- a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtMapper.java
+++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtMapper.java
@@ -62,4 +62,6 @@ interface SendNumMgtMapper {
 	List<InsertNumber> selectSndrnoListAll(InsertNumberReqDto insertNumberReqDto);
 	
 	String selectApiAuthToken(String apiApplicationId);
+	
+	String selectUserEmailByAdminId(String adminId);
 }
diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java
index 7ea42aa..71ef682 100644
--- a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java
+++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java
@@ -617,7 +617,13 @@ public class SendNumMgtService {
 	public UpdateApprResDto updateAppr(UpdateApprReqDto updateApprReqDto) {
 
 		SendNumMgtMapper sendNumMgtMapper = sqlSessionMaster.getMapper(SendNumMgtMapper.class);
+		
+		logger.debug("넘어오는 값 확인하기={}",updateApprReqDto);
 
+		String adminId = updateApprReqDto.getAdminId();
+		
+		String userEmail = sendNumMgtMapper.selectUserEmailByAdminId(adminId);
+		
 		Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
 		UserDetails userDetails = (UserDetails) principal;
 		String regId = userDetails.getUsername();
@@ -648,18 +654,19 @@ public class SendNumMgtService {
 			updateApprSendNumber.setAdminId(regId);
 			sendNumMgtMapper.updateSndrno(updateApprSendNumber);
 		}
-		String SndrNoString = sndrNoList.toString();
-		String re1 = SndrNoString.replace("[", "<br>");
-		String re2 = re1.replace(", ","</br><br>");
-		String re3 = re2.replace("]", "</br>");
-		
-		logger.debug("발신번호 리스트 스트링 ={}",re3);
 		
 		//2. 반려 발신번호 리스트에 값이 있을 경우 메일을 보냄
 		if(sndrNoList.size()>0) {
+			
+			//3. 발신번호 리스트 치환
+			String SndrNoString = sndrNoList.toString();
+			String re1 = SndrNoString.replace("[", "<br>");
+			String re2 = re1.replace(", ","</br><br>");
+			String re3 = re2.replace("]", "</br>");
+			
+//			logger.debug("발신번호 리스트 스트링 ={}",re3);
 			//try catch 처리하기
 			try {
-				String testEmail = "lmh3294@naver.com";
 				Map<Object, Object> mailResultMap = new HashMap<Object, Object>();
 				
 				// API authToken 조회
@@ -671,7 +678,7 @@ public class SendNumMgtService {
 				mailReqMap.put("rejectListSndrNo", re3);
 				mailReqMap.put("rejectHtml", updateApprReqDto.getMemo());
 				//이메일 수신자 가져오는 쿼리
-				mailReqMap.put("toEmail", testEmail);
+				mailReqMap.put("toEmail", userEmail);
 				mailReqMap.put("fromEmail", fromEmail);
 				mailReqMap.put("templeteCode", senrNoRejTempleteCode);
 				mailReqMap.put("homeUrl", mailTempleteHomeUrl);
diff --git a/src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml b/src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml
index 2fc0d23..c0811f6 100644
--- a/src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml
+++ b/src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml
@@ -217,6 +217,17 @@
 		WHERE
 			USER_ID = #{adminId}
 	</select>
+	
+	<select id="selectUserEmailByAdminId" parameterType="String" resultType="String">
+		/* sendNumMgt-mapper.xml(selectUserSeqByAdminId) */
+		SELECT
+			EMAIL
+		FROM
+			hubez_common.EZ_SVC_USER
+		WHERE
+			USER_ID = #{adminId}
+	</select>
+	
 
 	<delete id="deleteNumber" parameterType="kr.co.uplus.ez.api.sendNumMgt.dto.DeleteNumberReqDto">
 		/* sendNumMgt-mapper.xml(deleteNumber) */