From b3afff71835ee4029515356a9f2939f164853a71 Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Wed, 13 Mar 2024 18:16:46 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=86=8C=EC=9C=A0=EC=98=88=20?=
 =?UTF-8?q?=EB=8C=80=EC=83=81=EC=9E=90=EA=B4=80=EB=A6=AC=20=EC=9D=98?=
 =?UTF-8?q?=EB=A2=B0=EC=B7=A8=EC=86=8C=20=EC=A7=84=ED=96=89=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/CndtnPrcsInfoMngController.java               |  6 +++---
 .../oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp    | 11 ++++++++---
 .../WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp  |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
index a24f5cff..f8b1c3df 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
@@ -1886,8 +1886,8 @@ public class CndtnPrcsInfoMngController {
 			, HttpServletRequest request
 			) throws Exception {
 		
-		//LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
-		//SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
+		LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+		SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
 		
 		//로그인 처리====================================  
 
@@ -1903,7 +1903,7 @@ public class CndtnPrcsInfoMngController {
 //		model.addAttribute("fileListCnt", result.size());
 		
 		//대상 리스트, 페이징 정보 전달
-		//model.addAttribute("info", info);
+		model.addAttribute("loginId", loginVO.getId());
 		
 		return "/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup";
 	}
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp
index e4c57413..4519b0fc 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp
@@ -44,9 +44,13 @@
 		
 		function fn_updateCnclUpdate() {
 			var v_msg = $('#rmrks').val();
+			if(!v_msg){
+				alert("메모를 입력해 주세요");
+				return false;
+			}
 
 			window.opener.fn_popup_submit_cmmAjax(v_msg);
-			self.close();
+// 			self.close();
 		}
 	</script>
 </head>
@@ -60,7 +64,7 @@
 			<div class="area_popup">
 				<div class="cont_popup">
 					<div class="pop_tb_tit01">
-						<p>비공개 메모</p>
+						<p>비공개 메모(<c:out value="${loginId }"/>)</p>
 					</div>
 					
 					<div>
@@ -85,7 +89,8 @@
 						<div class="btn_left">
 						</div>
 						<div class="btn_center">
-							<button type="button" class="btn_type05" onclick="fn_updateCnclUpdate(30, 40, '취소');">등록</button>
+<!-- 							<button type="button" class="btn_type05" onclick="fn_updateCnclUpdate(30, 40, '취소');">등록</button> -->
+							<button type="button" class="btn_type05" id="test" onclick="fn_updateCnclUpdate();">등록</button>
 							<button type="button" class="btn_type02" onclick="window.close()">취소</button>
 						</div>
 						<div class="btn_right">
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
index 38c12ba1..45df2d5a 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
@@ -567,6 +567,7 @@
 
 	    function fn_popup_submit_cmmAjax(p_params){
 
+	    	console.log('???');
 			var sspnIdtmtTrgtOrdList = [];