From 042b30f1e843b2776724c71bd498cb0c8f8b5114 Mon Sep 17 00:00:00 2001
From: DuanDongmei <DuanDongmei@192.168.11.156>
Date: Wed, 5 Dec 2018 18:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=B8=ADaction=E5=8F=AA?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BAaction=E5=9B=BD=E9=99=85=E5=8C=96=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E4=B8=8D=E5=B1=95=E7=A4=BAservice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/report/list.jsp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index 5c0313261..03280ed1b 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -412,15 +412,13 @@ white-space:nowrap;
 							<div class="pull-left">
 								<form:select path="serviceId" class="selectpicker select2 input-small">
 									<form:option value=""><spring:message code="action"/></form:option>
-									<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action" > --%>
 										<c:forEach items="${serviceList}" var="service" >
-										<%-- <c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}"> --%>
-										      <c:if test="${(service.action ne 128) && (service.serviceId ne 37) && (service.serviceId ne 149)  }" >
-											  <form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
-										   </c:if>
-										<%-- </c:if> --%>
+										      <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)  }">  
+														<form:option value="${service.serviceId}"><spring:message code="${dict.itemValue}"/></form:option>
+													</c:if>
+												</c:forEach>
 										</c:forEach>
-									<%-- </c:forEach> --%>
 								</form:select>
 							</div>
 							<div class="pull-left">