From fbe87e8cbc5c556791a24de00a95ad543181d34f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Thu, 13 Dec 2018 09:55:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96message.tag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/tags/sys/message.tag | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/message.tag b/src/main/webapp/WEB-INF/tags/sys/message.tag
index 70d8fdf5d..778b1aeea 100644
--- a/src/main/webapp/WEB-INF/tags/sys/message.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/message.tag
@@ -15,7 +15,19 @@
 </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')&& !fn:containsIgnoreCase(content,'出错')&& !fn:containsIgnoreCase(content,'error'))?'success':'error'}"/></c:if>
-	<div id="messageBox" class="alert alert-${ctype}" style="max-height:220px;overflow-y:auto;overflow-x:hidden;"><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 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,'出错')&& !fn:containsIgnoreCase(content,'error'))?'success':'error'}"/>
+	</c:if>
+	<div id="messageBox" class="alert alert-${ctype}" style="max-height:220px;overflow-y:auto;overflow-x:hidden;"><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