From 736c4cda044359ebddaeaafe8ca3dc798c594278 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Fri, 25 Jan 2019 17:46:49 +0600
Subject: [PATCH] =?UTF-8?q?16=E5=8F=B7=E4=B9=8B=E5=89=8D=E7=9A=84=E7=89=88?=
 =?UTF-8?q?=E6=9C=ACasn=E8=BF=98=E6=98=AF=E4=B8=BA=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=EF=BC=8C=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86asn=E7=9A=84block=E5=92=8Cmonitor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp | 8 ++++++--
 src/main/webapp/WEB-INF/views/report/list.jsp    | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
index fcf37f274..60e044783 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -99,8 +99,12 @@
 									<c:forEach items="${serviceList}" var="service"
 											varStatus="satus">
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96) && (service.serviceId ne 37)&& (service.serviceId ne 149)  }">  
-												<form:option value="${service.serviceId}"><spring:message code="${dict.itemValue}"/></form:option>
+											<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96) }">  
+												<form:option value="${service.serviceId}">
+												<c:if test="${(service.serviceId eq 37) || (service.serviceId eq 149) }">ASN </c:if>
+												<spring:message code="${dict.itemValue}"></spring:message>
+												
+												</form:option>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index da53f0f76..bdbe6921b 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -603,11 +603,14 @@ white-space:nowrap;
 									<form:option value=""><spring:message code="action"/></form:option>
 										<c:forEach items="${serviceList}" var="service" >
 										      <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-													<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.serviceId ne 37)&& (service.serviceId ne 149)  }">  
+													<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128)  }">  
 														<c:choose>
 															<c:when test="${(service.serviceId eq 40) || (service.serviceId eq 152)}">
 																<form:option value="${service.serviceId}"><spring:message code="keywords"/> <spring:message code="${dict.itemValue}"/></form:option>
 															</c:when>
+															<c:when test="${(service.serviceId eq 37) || (service.serviceId eq 149)}">
+																<form:option value="${service.serviceId}">ASN <spring:message code="${dict.itemValue}"/></form:option>
+															</c:when>
 															<c:otherwise>
 																<form:option value="${service.serviceId}"><spring:message code="${dict.itemValue}"/></form:option>
 															</c:otherwise>