From b51f1ea8213a19ced91797282454e7ce65e1e316 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 4 Mar 2024 14:36:25 +0900
Subject: [PATCH] =?UTF-8?q?2024-03-04=20=EA=B8=B0=EC=86=8C=EC=9C=A0?=
 =?UTF-8?q?=EC=98=88=20=EA=B3=BC=EC=A0=95=EA=B4=80=EB=A6=AC,=20=EA=B2=8C?=
 =?UTF-8?q?=EC=8B=9C=ED=8C=90,=20=EC=9D=98=EB=A2=B0=EC=B7=A8=EC=86=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kcc/let/cop/bbs/web/EgovBBSManageController.java  | 11 ++++++++++-
 .../sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml              |  3 +++
 .../webapp/WEB-INF/jsp/cop/bbs/EgovNoticeInqire.jsp   | 10 ++++++++--
 .../webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp     |  4 ++++
 .../WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp     |  1 +
 .../WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp  |  3 ++-
 6 files changed, 28 insertions(+), 4 deletions(-)

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#
 		</isNotEmpty>
 		
+			<isEqual property="lctrDivCd" compareValue="60">
+				AND NVL(A.USE_YN,'Y')='Y'
+			</isEqual>		
 		
 		<isNotEmpty property="searchSmbtStartDt">
 			/*등록일시*/
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 @@
 								<button class="btnType02" onclick="javascript:fn_egov_useY_notice(); return false;">사용처리</button>
 							</c:when>
 							<c:otherwise>
-								<button class="btnType04" onclick="javascript:fn_egov_delete_notice(); return false;">삭 제</button>
+								<c:if test="${Authority ne 'ROLE_ADR_JRSDC'}">
+									<button class="btnType04" onclick="javascript:fn_egov_delete_notice(); return false;">삭 제</button>
+								</c:if>
 							</c:otherwise>
 						</c:choose>
-						<button class="btnType06" onclick="javascript:fn_egov_moveUpdt_notice(); return false;">수 정</button>
+						
+						<c:if test="${Authority ne 'ROLE_ADR_JRSDC'}">
+							<button class="btnType06" onclick="javascript:fn_egov_moveUpdt_notice(); return false;">수 정</button>
+						</c:if>
+						
 						</div>
 						<div class="area_right">
 							<c:if test="${brdMstrVO.replyPosblAt != 'N'}">
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(){
 				</c:if>	
 				<!-- 포토형 게시판 끝-->
 				
+				
+				<c:if test="${Authority ne 'ROLE_ADR_JRSDC'}">
+				
 				<!-- btn_wrap -->
 				<div class="btn_wrap btn_layout01">
 					<div class="area_left">
@@ -519,6 +522,7 @@ function bbsExcelDownload(){
 					</div>
 				</div>
 				<!-- //btn_wrap -->
+				</c:if>
 				
 				<!-- 페이지 네비게이션 시작 -->
 				<c:if test="${!empty resultList}">
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;