From 837574cd706db5de33d58de869848dae3621766a Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Thu, 8 Nov 2018 18:18:28 +0800
Subject: [PATCH] =?UTF-8?q?APP=E5=8D=8F=E8=AE=AEIP/HTTP=E7=89=B9=E5=BE=81/?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D=E7=89=B9=E5=BE=81=E9=85=8D=E7=BD=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=93=8D=E4=BD=9C=E6=A1=86=E5=BA=94=E7=94=A8=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/include/excel/importModal.jsp   | 14 +++++++-------
 .../webapp/static/pages/scripts/importExcel.js     |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/excel/importModal.jsp b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
index 018336410..2ffed7570 100644
--- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp
+++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
@@ -104,13 +104,13 @@
 					           <label class="control-label col-md-3"><font color="red">*</font><spring:message code="letter"/></label>
 					           <div class="col-md-6">
 					               <select name="requestId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
-					               		<option value=""><spring:message code="select"/></option>
-					               	<c:forEach items="${requestInfos}" var="requestInfo" varStatus="status">
-					               		<c:if test="${requestInfo.isValid!=0 and requestInfo.isAudit!=3}">
-					               			<option value="${requestInfo.id}" 
-					               		 	<c:if test="${status.index==0 }">selected</c:if>>${requestInfo.requestTitle}</option>
-					               		</c:if>
-					               	</c:forEach>
+					               		<%-- <option value=""><spring:message code="select"/></option> --%>
+						               	<c:forEach items="${requestInfos}" var="requestInfo" varStatus="status">
+						               		<c:if test="${requestInfo.isValid!=0 and requestInfo.isAudit!=3}">
+						               			<option value="${requestInfo.id}" 
+						               		 	<c:if test="${status.index==0 }">selected</c:if>>${requestInfo.requestTitle}</option>
+						               		</c:if>
+						               	</c:forEach>
 					               </select>
 					           </div>
 					           <div for="requestId"></div>
diff --git a/src/main/webapp/static/pages/scripts/importExcel.js b/src/main/webapp/static/pages/scripts/importExcel.js
index efdd42b53..40718e18c 100644
--- a/src/main/webapp/static/pages/scripts/importExcel.js
+++ b/src/main/webapp/static/pages/scripts/importExcel.js
@@ -113,7 +113,8 @@ var importCfg=function(){
 		return ;
 	}
 	var appFlag=true;
-	if(($("#functionId").val() == 63)||($("#functionId").val() == 408)||($("#functionId").val() == 407)){
+	if(($("#functionId").val() == 63)||($("#functionId").val() == 408)||($("#functionId").val() == 407)||
+			($("#functionId").val() == 402)||($("#functionId").val() == 403)||($("#functionId").val() == 405)){
 		var appIdValue=$("#appIdName").val();
 		if(appIdValue == null || appIdValue ==''){
 			appFlag=false;