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 @@
비공개 메모
+비공개 메모(