2024-03-04 기소유예 과정관리, 게시판, 의뢰취소 수정

src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java

@@ -288,6 +288,11 @@ public class EgovBBSManageController {
 		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";
 	}
 

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">
 			/*등록일시*/

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>
+								<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>
+						
+						<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'}">

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}">

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;

src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp

@@ -423,6 +423,7 @@
 				// 그 외에 값이면 loop 나온 뒤 경고 alert 실행 후 function 종료				
 				if($(this).data('eduinfo') != 10 
 						&& $(this).data('eduinfo') != 50
+						&& $(this).data('eduinfo') != ''
 				){
 					chk = true;
 					return;