From 52412bfc801ebd8d07ca25ae7a613c07a83d40a1 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 21 Aug 2018 08:44:31 +0800
Subject: [PATCH] =?UTF-8?q?ip=E5=85=AC=E5=85=B1=E5=B1=95=E7=A4=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9=E9=99=90=E9=80=9F=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index d5d300700..dbcaaf6a9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -323,6 +323,11 @@
 					<div class="table-responsive">
 						<sys:message content="${message}"/>
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
+							<c:forEach items="${serviceList}" var="service">
+								<c:if test="${service.action==64}">
+									<c:set var="hasRatelimit" value="1"/>
+								</c:if>
+							</c:forEach>
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
@@ -351,7 +356,7 @@
 									<th exportColumn="group_name"><spring:message code="group"/></th>
 									<th exportColumn="ir_type"><spring:message code="ir_type"/></th>
 									</c:if>
-									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipratelimit'}">
+									<c:if test="${hasRatelimit==1}">
 									<th exportColumn="ratelimit"><spring:message code="ratelimit"/></th>
 									</c:if>
 									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'pxyIpControl'}">
@@ -444,9 +449,9 @@
 							             </c:forEach>
 									</td>
 									</c:if>
-									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipratelimit'}">
+									<c:if test="${hasRatelimit==1}">
 									<td>
-									<c:if test="${cfg.ratelimit eq null}">0%</c:if>
+									<c:if test="${cfg.ratelimit eq null and cfg.action==64}">0%</c:if>
 									<c:if test="${cfg.ratelimit ne null}">${cfg.ratelimit}%</c:if>
 									</td>
 									</c:if>