From 64129e1006122375d67ac6ae73f2334656c51e0a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 03 四月 2022 18:26:53 +0800
Subject: [PATCH] 修复Excel注解prompt/combo同时使用不生效问题

---
 src/main/java/com/ruoyi/framework/aspectj/LogAspect.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index d8dcf59..eb3f9a0 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -65,7 +65,6 @@
     {
         try
         {
-
             // 鑾峰彇褰撳墠鐨勭敤鎴�
             LoginUser loginUser = SecurityUtils.getLoginUser();
 
@@ -167,8 +166,14 @@
             {
                 if (StringUtils.isNotNull(o) && !isFilterObject(o))
                 {
-                    Object jsonObj = JSON.toJSON(o);
-                    params += jsonObj.toString() + " ";
+                    try
+                    {
+                        Object jsonObj = JSON.toJSON(o);
+                        params += jsonObj.toString() + " ";
+                    }
+                    catch (Exception e)
+                    {
+                    }
                 }
             }
         }

--
Gitblit v1.9.3