From 71abbfb9cf970937b265d1b57074a1a2e5a048b2 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 27 Nov 2019 13:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeesite/modules/sys/utils/LogUtils.java   |  4 ++--
 .../resources/views/modules/sys/logForm.html  | 19 ++++++-------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java
index aaddf4ce..9e0bbd27 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/utils/LogUtils.java
@@ -107,8 +107,8 @@ public class LogUtils {
         log.preInsert();
         
         // 获取异常对象
-        Throwable throwable = null;
-        if (ex != null){
+        Throwable throwable = ex;
+        if (throwable == null){
         	throwable = ExceptionUtils.getThrowable(request);
         }
 
diff --git a/modules/core/src/main/resources/views/modules/sys/logForm.html b/modules/core/src/main/resources/views/modules/sys/logForm.html
index 165b4793..e8faf7e0 100644
--- a/modules/core/src/main/resources/views/modules/sys/logForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/logForm.html
@@ -78,19 +78,6 @@
 						</div>
 					</div>
 				</div>
-				<% if(@Global.YES.equals(log.isException)){ %>
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="form-group">
-							<label class="control-label col-sm-2" title="">
-								<span class="required hide">*</span> 异常信息：<i class="fa icon-question hide"></i></label>
-							<div class="col-sm-10">
-								<#form:textarea path="exceptionInfo" rows="10" class="form-control "/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<% } %>
 				<div class="row">
 					<div class="col-xs-6">
 						<div class="form-group">
@@ -173,6 +160,12 @@
 						</div>
 					</div>
 				</div>
+				<% if(@Global.YES.equals(log.isException)){ %>
+				<div class="form-unit">${text('异常信息')}</div>
+				<div class="ml10 mr10 mb10">
+					<#form:textarea path="exceptionInfo" rows="20" class="form-control autoHeight"/>
+				</div>
+				<% } %>
 			</div>
 			<div class="box-footer">
 				<div class="row">