From 55f34ab9da75010edbd1143858967ac9de14eebc Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 13 Mar 2024 17:11:05 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B8=B4=EA=B8=89:=20=EA=B8=B0=EC=86=8C?= =?UTF-8?q?=EC=9C=A0=EC=98=88=20=EB=8F=99=EC=9D=98=20popup=EC=97=90=20?= =?UTF-8?q?=ED=8F=B0=EB=B2=88=ED=98=B8=20=EB=9E=80=EC=97=90=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EB=93=A4=EC=96=B4=EA=B0=84=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=ED=95=B8=EB=93=9C=ED=8F=B0=20input=20val?= =?UTF-8?q?ue=20=EC=B2=B4=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp | 27 +++++++++++++++++-- .../aplct/sspnIdtmt/popup/eduAplctPopList.jsp | 5 ++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp index 9fa30ead..38e1e565 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPop.jsp @@ -60,9 +60,15 @@ $(document).ready(function(){ $('#fld').attr('type', 'hidden'); } - }) + }); -// $('#fld').hide(); +// $('#phone').keyup(function() { +// var input = $(this).val(); +// console.log('input : ', input); +// // 숫자가 아닌 모든 문자를 찾아서 삭제합니다. +// var numericInput = input.replace(/[^0-9]/g, ''); +// $(this).val(numericInput); +// }); }); @@ -90,6 +96,15 @@ $(document).ready(function(){ // alert 두번 방지 if if(valChk){ + var phoneNumber = $('#phone').val(); + // -가 없는 핸드폰 번호 형식을 검사하는 정규 표현식 + var regex = /^01[0-9]{8,9}$/; + + if(!regex.test(phoneNumber)) { + alert("올바른 핸드폰 번호 형식이 아닙니다.\n01012341234 형식으로 입력해 주세요"); + return false; + } + if(!$('#chkY').prop("checked")){ alert('개인정보 처리 동의해 주세요.') @@ -98,9 +113,17 @@ $(document).ready(function(){ } + + + return valChk; } + + + + + function fncEduReg(){ if(!fnValidation()){ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp index eefaba22..f38a9026 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp @@ -72,6 +72,7 @@ //제출 function fn_new_confirm(p_prcsAplctPrdOrd){ var form = document.confirmForm; + console.log('$("#dBirth").val() : ' , $('#dBirth').val()); var dBirth = $('#dBirth').val().replace(/\./g, ''); var trgtNm = $('#trgtNm').val(); var sex = $('input[name="sex"]:checked').val(); @@ -83,8 +84,8 @@ alert("성명을 입력해주세요."); return; } - - if (dBirth==""){ + console.log('dBirth : ' , dBirth); + if (!dBirth){ alert("주민번호앞자리를 입력해주세요."); return; } From b3afff71835ee4029515356a9f2939f164853a71 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 13 Mar 2024 18:16:46 +0900 Subject: [PATCH 2/3] =?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(); } @@ -60,7 +64,7 @@
-

비공개 메모

+

비공개 메모()

@@ -85,7 +89,8 @@
- + +
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 = []; From 0a7852739dd1fca0bd71cc318951f4d16d5c2f94 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 13 Mar 2024 18:33:43 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=8C=80=EC=83=81=EC=9E=90=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20>=20=EC=97=91=EC=85=80=EB=8B=A4=EC=9A=B4=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=EB=8C=80=EC=83=81=EC=9E=90=EC=9D=B4=EB=A6=84=20?= =?UTF-8?q?=EB=B3=B5=ED=98=B8=ED=99=94=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index f4b85fc6..07c0d77e 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -1914,6 +1914,8 @@ public class CndtnTrgtMngController { try { cndtnTrgtInfoMngVOList = cndtnTrgtInfoMngService.selectPagingList(cndtnTrgtInfoMngVO); + cndtnTrgtInfoMngVOList = egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoMngVOList); + } catch (Exception e) { e.printStackTrace(); // TODO: handle exception