From 66c4608a5166a57e0b78454ca5c53e34ac7d8e29 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Tue, 30 Oct 2018 13:51:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=93=8D=E4=BD=9C=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangwei <zhangwei2@iie.ac.cn>
---
 .../WEB-INF/views/sys/cfgOperationLogList.jsp | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp b/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
index 34bbe8b41..bf9626f83 100644
--- a/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/cfgOperationLogList.jsp
@@ -105,8 +105,26 @@
 									<c:forEach items="${page.list}" var="log">
 										<tr>
 											<td><spring:message code="${log.functionName}"></spring:message></td>											
-											<td><strong>
-												<spring:message code="${log.operation}"></spring:message>
+											<td>
+												<c:choose>
+													<c:when test="${log.auditState eq '0'}">
+														<c:set var="operation"><spring:message code="${log.operation}"></spring:message>-<spring:message code="created"></spring:message></c:set>
+													</c:when>
+													<c:when test="${log.auditState eq '1'}">
+														<c:set var="operation"><spring:message code="${log.operation}"></spring:message>-<spring:message code="approved"></spring:message></c:set>
+													</c:when>
+													<c:when test="${log.auditState eq '2'}">
+														<c:set var="operation"><spring:message code="${log.operation}"></spring:message>-<spring:message code="unapproved"></spring:message></c:set>
+													</c:when>
+													<c:when test="${log.auditState eq '3'}">
+														<c:set var="operation"><spring:message code="${log.operation}"></spring:message>-<spring:message code="cancel_approved"/></c:set>
+													</c:when>
+													<c:otherwise>
+														<c:set var="operation"><spring:message code="${log.operation}"></spring:message></c:set>
+													</c:otherwise>
+												</c:choose>
+												${operation}
+												<%-- <strong><spring:message code="${log.operation}"></spring:message>
 												<c:if test="${not empty log.auditState }">
 													-
 													<c:choose>
@@ -116,7 +134,8 @@
 														<c:when test="${log.auditState eq '3'}"><spring:message code="cancel_approved"/></c:when>
 													</c:choose>
 												</c:if>	
-											</strong></td>
+											</strong> --%>
+											</td>
 											<td>
 												${log.method}												
 											</td>