From 9d3f806e0d0b319a53351eaa7f2b5855175f0a0f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 17 Mar 2021 14:57:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=8F=82=E6=95=B0=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/framework/aspectj/LogAspect.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index b638a791..875fa4f1 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -89,7 +89,10 @@ public class LogAspect
             String ip = ShiroUtils.getIp();
             operLog.setOperIp(ip);
             // 返回参数
-            operLog.setJsonResult(StringUtils.substring(JSON.marshal(jsonResult), 0, 2000));
+            if (StringUtils.isNotNull(jsonResult))
+            {
+                operLog.setJsonResult(StringUtils.substring(JSON.marshal(jsonResult), 0, 2000));
+            }
 
             operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
             if (currentUser != null)