diff --git a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java index 5ab11136..7848426e 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java @@ -287,7 +287,12 @@ public class EgovBBSManageController { model.addAttribute("boardVO", boardVO); model.addAttribute("brdMstrVO", master); model.addAttribute("paginationInfo", paginationInfo); - + + model.addAttribute("Authority", user.getAuthority()); //ROLE_ADR_JRSDC + //System.out.println("user.getAuthority()"); + //System.out.println(user.getAuthority()); + //System.out.println(user.get.getAuthority()); + //임시 데이터 이관용 String ip = request.getHeader("X-Forwarded-For"); if (ip == null) ip = request.getRemoteAddr(); @@ -297,6 +302,8 @@ public class EgovBBSManageController { model.addAttribute("Transfer", true ); } System.out.println("---ip----"+ip); + + return "cop/bbs/EgovNoticeList"; } @@ -728,6 +735,8 @@ public class EgovBBSManageController { model.addAttribute("result", vo); model.addAttribute("brdMstrVO", masterVo); + model.addAttribute("Authority", user.getAuthority()); //ROLE_ADR_JRSDC + return "cop/bbs/EgovNoticeInqire"; } diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml index 1aa9ee24..f52f0348 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml @@ -225,6 +225,9 @@ AND a.lctr_div_cd=#lctrDivCd# + + AND NVL(A.USE_YN,'Y')='Y' + /*등록일시*/ diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeInqire.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeInqire.jsp index 04d1d6d5..7d1c7589 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeInqire.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeInqire.jsp @@ -397,10 +397,16 @@ - + + + - + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp index d266cb9e..993b4bfa 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp @@ -509,6 +509,9 @@ function bbsExcelDownload(){ + + +
@@ -519,6 +522,7 @@ function bbsExcelDownload(){
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp index e8e12491..fd745b10 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp @@ -265,6 +265,7 @@ // 그 외에 값이면 loop 나온 뒤 경고 alert 실행 후 function 종료 if($(this).data('eduinfo') != 10 && $(this).data('eduinfo') != 50 + && $(this).data('eduinfo') != '' ){ chk = true; return; 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 26631adc..e9f728c8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -420,9 +420,10 @@ sspnIdtmtTrgtOrdList.push(sspnIdtmtTrgtOrdValue); // 교육상태가 대기/ 연기 인지 확인 - // 그 외에 값이면 loop 나온 뒤 경고 alert 실행 후 function 종료 + // 그 외에 값이면 loop 나온 뒤 경고 alert 실행 후 function 종료 if($(this).data('eduinfo') != 10 && $(this).data('eduinfo') != 50 + && $(this).data('eduinfo') != '' ){ chk = true; return;