From 27a0aecff24bd14e21211eef30e1d5cef4fbd817 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Fri, 15 Mar 2024 18:28:26 +0900
Subject: [PATCH] =?UTF-8?q?2024-03-15=2018:28=20=EC=B2=AD=EC=86=8C?=
 =?UTF-8?q?=EB=85=84=20=EA=B0=95=EC=82=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml              | 4 ++++
 .../ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp  | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
index ff005a22..2bd49a4f 100644
--- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
@@ -362,6 +362,7 @@
 							AND     a.edu_chasi_ord = d.edu_chasi_ord
 							)
 			WHERE   1 = 1
+			AND NVL(c.use_yn,'Y')='Y'
 			AND     c.lctr_div_cd = #instrDiv#
 			<isEmpty property="searchAsgnmAprvlCd">
 			AND
@@ -446,6 +447,7 @@
 							AND   a.edu_chasi_ord = e.edu_chasi_ord
 							)   
 			WHERE  1 = 1
+			AND NVL(c.use_yn,'Y')='Y'
 			AND		c.lctr_div_cd = #instrDiv#
 			
 			<isEmpty property="searchAsgnmAprvlCd">
@@ -725,6 +727,8 @@
 					a.edu_aplct_ord = e.edu_aplct_ord
 					AND a.edu_chasi_ord = e.edu_chasi_ord
 					)
+			WHERE 1=1
+				AND nvl(c.use_yn,'Y')='Y'					
 			) AA
 		WHERE 1=1
 			AND AA.asgnmAprvlCd	= #asgnmAprvlCd#
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
index ec14c173..157baa8c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp
@@ -280,16 +280,16 @@
 									<!-- 배정 수락 요청 상태 -->
 									<c:set var="statCd" value="대기" />									
 								</c:when>
-								<c:when test="${(list.asgnmAprvlCd eq '40' and list.userId eq loginVO.id) or 
+								<c:when test="${(list.asgnmAprvlCd eq '40') or 
 										(list.hstryUserId eq loginVO.id and (list.hstryCd eq '10' or list.hstryCd eq '40'))}">
 								<!-- 배정 거절 or 내역 거절 or 내열에 변경요청 -->
 									<c:set var="statCd" value="거절" />
 								
 								</c:when>
-								<c:when test="${list.asgnmAprvlCd eq '30' and list.userId eq loginVO.id}">
+								<c:when test="${list.asgnmAprvlCd eq '30'}">
 									<c:set var="statCd" value="수락" />
 								</c:when>
-								<c:when test="${list.asgnmAprvlCd eq '50' and list.userId eq loginVO.id}">
+								<c:when test="${list.asgnmAprvlCd eq '50'}">
 									<c:set var="statCd" value="강의신청" />
 								</c:when>
 							</c:choose>