From 9a44330b54b6b908c52842bd1a3d683500c4c9e8 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Wed, 6 Sep 2023 11:43:02 +0900
Subject: [PATCH] =?UTF-8?q?2023-09-06=2011:42=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pblc/sndMng/web/SndMngController.java     | 28 +++++++++++--------
 src/main/webapp/WEB-INF/decorators.xml        |  2 ++
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java
index 881f9de9..6489f318 100644
--- a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java
+++ b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java
@@ -318,6 +318,12 @@ public class SndMngController {
 	 * 메일 발송
 	 */
     
+	/**
+	 * @param vEEduAplctVO
+	 * @param model
+	 * @return
+	 * @throws Exception
+	 */
 	@RequestMapping(value="emailSndAjax.do")
 	public ModelAndView emailSndAjax(					 
 			VEEduAplctVO vEEduAplctVO    		
@@ -359,25 +365,25 @@ public class SndMngController {
        
         String result = sendMail.VeSendMail(vEEduAplctVO.getSndFlag(), vEEduAplctVO.getEmail(), vEEduAplctVO, loginVO);
         
+
         if("success".equals(result)) {
         	//메일 발송 로그
-    		String snd_ord = sndGnrService.getNextStringId();
-    		vEEduAplctVO.setSndHstryOrd(snd_ord);
-    		
-    		vEEduAplctVO.setSndId(loginVO.getUniqId());
-    		
-    		vEEduAplctSndHstryService.insert(vEEduAplctVO);
-        }
-		//메일 발송 부 끝
-        
+        	String snd_ord = sndGnrService.getNextStringId();
+        	vEEduAplctVO.setSndHstryOrd(snd_ord);
+        	
+        	vEEduAplctVO.setSndId(loginVO.getUniqId());
+        	
+        	vEEduAplctSndHstryService.insert(vEEduAplctVO);
+        }        	
+
+        //메일 발송 부 끝
         modelAndView.addObject("result", result);
+
         
         return modelAndView;
 
     }
 	
-	
-	
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
     //
     //
diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml
index 0958ee2c..0b8a7468 100644
--- a/src/main/webapp/WEB-INF/decorators.xml
+++ b/src/main/webapp/WEB-INF/decorators.xml
@@ -14,6 +14,7 @@
 		
 		<!-- 사용자 화면 -->
 		<pattern>/web/survey/surveyResultPreview.do</pattern>					<!-- 사용자 설문 결과 팝업 -->
+		<pattern>/web/survey/jsontest.do</pattern>					<!-- 사용자 설문 결과 팝업 -->		
 		<pattern>/web/ve/aplct/tngrVisitEdu/lctrSrvy/lctrSrvyReg.do</pattern>	<!-- 찾교 설문조사 화면 -->
 		<pattern>*/web/ve/**/*Popup*</pattern> 									<!-- 찾교 팝업(강사신청 반려 팝업) -->
 		
@@ -39,6 +40,7 @@
 		<pattern>*/oprtn/cmm/SchduleManagerPopDetail.jsp</pattern> <!-- 청소년찾아가는저작권 교육 > 교육일정관리 > 교육내용 팝업 -->
 		<pattern>*/oprtn/cmm/SchduleManagerPopDetailAdult.jsp</pattern> <!-- 성인찾아가는저작권 교육 > 교육일정관리 > 교육내용 팝업 -->
 		<pattern>*/oprtn/cmm/rejectPopup.jsp</pattern>					<!-- 반려 팝업 -->
+		<pattern>*/oprtn/comm/popup/**</pattern>					<!-- 반려 팝업 -->
 	</decorator>
 	
 	<!-- 찾교 추가 관리자 -->