From d843d1e412b11c8aca6acaf702ae5c0ae2850341 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 14 Aug 2018 18:37:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=B8=AD=E6=96=87=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/tags/sys/message.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/message.tag b/src/main/webapp/WEB-INF/tags/sys/message.tag
index 3b35d6bb0..94d5aadb6 100644
--- a/src/main/webapp/WEB-INF/tags/sys/message.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/message.tag
@@ -11,7 +11,7 @@
 </style>
 <script type="text/javascript">top.$.jBox.closeTip();</script>
 <c:if test="${not empty content}">
-	<c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${(!fn:containsIgnoreCase(content,'失败') && !fn:containsIgnoreCase(content,'failed') && !fn:containsIgnoreCase(content,'Exception') && !fn:containsIgnoreCase(content,'null'))?'success':'error'}"/></c:if>
+	<c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${(!fn:containsIgnoreCase(content,'失败') && !fn:containsIgnoreCase(content,'failed') && !fn:containsIgnoreCase(content,'Exception') && !fn:containsIgnoreCase(content,'null')&& !fn:containsIgnoreCase(content,'出错'))?'success':'error'}"/></c:if>
 	<div id="messageBox" class="alert alert-${ctype}"><button data-dismiss="alert" class="close">×</button><spring:message code="${content}"/></div> 
 	<script type="text/javascript">if(!top.$.jBox.tip.mess) {top.$.jBox.tip.mess=1;top.$.jBox.tip("<spring:message code='${content}'/>","${ctype}",{persistent:true,opacity:0});$("#messageBox").show();}</script>
 </c:if>
\ No newline at end of file