From ab235cab8e5e57dd384842496d7134010c998742 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Fri, 22 Mar 2024 15:47:50 +0900
Subject: [PATCH] =?UTF-8?q?2024-03-22=2015:47=20=EA=B0=95=EC=9D=98?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EC=8B=A0=EC=B2=AD=EC=83=81=ED=83=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp   | 5 +++++
 .../ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp   | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
index c16df188..f8838f12 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -732,6 +732,7 @@
 				<table>
 					<colgroup>
 						<col style="width: 50px">
+						<col style="width: 70px">
 						<col style="width: 210px;">
 						<col style="width: 150px;">
 						<col style="width: auto">
@@ -745,6 +746,7 @@
 					<thead>
 					<tr>
 						<th><input type="checkbox" name="checkAll" id="checkAll" onclick="chkAll(this);" /><label for="checkAll"></label></th>
+						<th>순번</th>
 						<th>신청자(대상자)</th>
 						<th>주민번호 앞자리</th>
 						<th>이메일</th>
@@ -768,6 +770,9 @@
 												data-clphone="<c:out value='${list.phone}' />" title="Check" type="checkbox"/>											
 											</c:if>
 										</td>
+										<td>
+											${status.count}
+										</td>
 										<td>
 											<c:out value="${list.trgtNm}"/><br/>(<c:out value="${list.mberId}"/>)
 <%-- 											<br/>(<c:out value="${list.sspnIdtmtTrgtOrd}"/>) --%>
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 976b0f81..d4573aec 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
@@ -293,7 +293,8 @@
 								or 
 								(list.hstryUserId eq loginVO.id and (list.hstryCd eq '10' or list.hstryCd eq '40'))
 								or 
-								(list.asgnmAprvlCd eq '30' and list.hstryUserId eq list.userId and (list.hstryCd eq '10' or list.hstryCd eq '40'))
+								(list.asgnmAprvlCd eq '30' and list.hstryUserId ne list.userId 
+								and (list.hstryCd eq '10' or list.hstryCd eq '40'))
 								}">
 								<!-- 배정 거절 or 내역 거절 or 내열에 변경요청 -->
 									<c:set var="statCd" value="거절" />