Merge branch 'JIWOO' into advc

src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml

@@ -3782,9 +3782,14 @@ VALUES
 		        AND      a0.edu_aplct_ord                =A.EDU_APLCT_ORD
 		        AND NVL(a0.sbmt_yn,'N')='Y'                 
              
-             ) AS endEduPrsnl		
+             ) AS endEduPrsnl,
+             
+             ( 
+             	SELECT chrg_mjr
+             	FROM ve_edu_oprtn veo
+             	WHERE veo.EDU_APLCT_ORD = A.EDU_APLCT_ORD
+             ) AS chrgMjr
              
-			 
 		FROM VE_EDU_APLCT A 
 		
 		WHERE 1=1

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp

@@ -19,7 +19,10 @@
 	
 	function openPop(){
 		//if(!checkAplctPsbl()) return;
-		
+		if(${detailVO == null}){
+			alert("등록된 운영신청 안내가 없습니다.");
+			return false;
+		}
 		commonPopLayeropen(
 				"${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/cautionGuide.do"
 				, 730

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp

@@ -968,7 +968,7 @@
 				</th>
 				<td>
 					<label for="trgtGrade" class="label">필요 교재 수량 입력</label>
-					<input type="text" name="trgtPrsnlReal" id="trgtPrsnlReal"  onkeyup="onlyNumber(this);" value="${info.trgtPrsnlReal}" title="전체 교육인원" size="20" maxlength="4"> 
+					<input type="text" name="needTxtbNum" id="needTxtbNum"  onkeyup="onlyNumber(this);" value="${info.trgtPrsnlReal}" title="전체 교육인원" size="20" maxlength="4"> 
 				</td>
 			</tr>
 			<%-- <tr>