From 7c93338dce3021e2af704532e489ffb466188131 Mon Sep 17 00:00:00 2001
From: shangguanyanfei <shangguan@zdjizhi.com>
Date: Sun, 27 Jan 2019 18:55:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=9A=E5=8A=A1=E9=85=8D=E7=BD=AE-?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=91=B8=E6=9D=BF=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=9D=A5=E5=87=BD=E4=B8=8B=E6=8B=89=E6=A1=86=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=88=E6=94=B9=E4=B8=BA=E5=8F=AA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=9A=E8=BF=87=E7=9A=84=E6=9D=A5=E5=87=BD=EF=BC=89?=
 =?UTF-8?q?=202.=E4=B8=9A=E5=8A=A1=E9=85=8D=E7=BD=AE=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2-=E7=AD=9B=E9=80=89=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=9D=A5=E5=87=BD=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=98=BE=E7=A4=BA=EF=BC=88=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E7=9A=84=E5=92=8C=E9=85=8D=E7=BD=AE=E5=8F=96=E6=B6=88=E7=9A=84?=
 =?UTF-8?q?=E6=9D=A5=E5=87=BD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml | 1 +
 src/main/webapp/WEB-INF/include/excel/importModal.jsp          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
index 423c617dd..46445fa3d 100644
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
@@ -254,6 +254,7 @@
 	select
 		<include refid="Base_Column_List" />
 	from request_info
+	where is_audit in(1,3)
   </select>
   
     <select id="findAllLwhhList" resultMap="BaseResultMap">
diff --git a/src/main/webapp/WEB-INF/include/excel/importModal.jsp b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
index f47c82e69..7de33313a 100644
--- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp
+++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
@@ -133,7 +133,7 @@
 					               <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}">
+						               		<c:if test="${requestInfo.isValid!=0 and requestInfo.isAudit ==1}">
 						               			<option value="${requestInfo.id}" 
 						               		 	<c:if test="${status.index==0 }">selected</c:if>>${requestInfo.requestTitle}</option>
 						               		</c:if>