From d311d56bbfb4c37899b426457ac6a46e33874f0f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 03 四月 2022 18:28:30 +0800
Subject: [PATCH] 修复Excel注解prompt/combo同时使用不生效问题
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
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 10fa58f..c9ce322 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
@@ -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.2