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 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 86e5f590..8f69658d 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 = []; 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; }