From 19fc9eb7af9d8145a8a0205a50e22e901ce67c88 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@zdjizhi.com>
Date: Tue, 15 Jan 2019 16:50:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8B=A6=E6=88=AA=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=85=A5=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E9=A1=B5action=E5=9B=BD=E9=99=85=E5=8C=96.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/include/excel/importModal.jsp  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/include/excel/importModal.jsp b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
index 39b6c1f9e..0b5db22dc 100644
--- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp
+++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
@@ -47,7 +47,20 @@
 															<c:if test="${serviceIndex eq 0}">checked</c:if>>
 															<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 																<c:if test="${dict.itemCode eq service.action }">
-																	<spring:message code="${dict.itemValue }"/>
+																	<c:if test="${service.functionId eq 200 }">
+																		<c:if test="${service.action eq 1 }">
+																			<spring:message code="intercept"/>
+																		</c:if>
+																		<c:if test="${service.action eq 128 }">
+																			<spring:message code="bypass"/>
+																		</c:if>
+																		<c:if test="${service.action ne 1 && service.action ne 128}">
+																			<spring:message code="${dict.itemValue }"/>
+																		</c:if>
+																	</c:if>
+																	<c:if test="${service.functionId ne 200 }">
+																		<spring:message code="${dict.itemValue }"/>
+																	</c:if>
 																</c:if>
 															</c:forEach>
 													</label>