From 06513446a0a4a993d17e7bb8085f7bf7dfb4597c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 29 五月 2021 19:44:33 +0800
Subject: [PATCH] update 还原数据权限修改
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 42b0031..442d258 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
@@ -1,5 +1,6 @@
package com.ruoyi.framework.aspectj;
+import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
@@ -36,7 +37,7 @@
/**
* 鎿嶄綔鏃ュ織璁板綍澶勭悊
- *
+ *
* @author ruoyi
*/
@Aspect
@@ -64,7 +65,7 @@
/**
* 鎷︽埅寮傚父鎿嶄綔
- *
+ *
* @param joinPoint 鍒囩偣
* @param e 寮傚父
*/
@@ -130,7 +131,7 @@
/**
* 鑾峰彇娉ㄨВ涓鏂规硶鐨勬弿杩颁俊鎭� 鐢ㄤ簬Controller灞傛敞瑙�
- *
+ *
* @param log 鏃ュ織
* @param operLog 鎿嶄綔鏃ュ織
* @throws Exception
@@ -153,7 +154,7 @@
/**
* 鑾峰彇璇锋眰鐨勫弬鏁帮紝鏀惧埌log涓�
- *
+ *
* @param operLog 鎿嶄綔鏃ュ織
* @throws Exception 寮傚父
*/
@@ -198,7 +199,7 @@
{
for (int i = 0; i < paramsArray.length; i++)
{
- if (!isFilterObject(paramsArray[i]))
+ if (Validator.isNotNull(paramsArray[i]) && !isFilterObject(paramsArray[i]))
{
Object jsonObj = JSON.toJSON(paramsArray[i]);
params += jsonObj.toString() + " ";
@@ -210,7 +211,7 @@
/**
* 鍒ゆ柇鏄惁闇�瑕佽繃婊ょ殑瀵硅薄銆�
- *
+ *
* @param o 瀵硅薄淇℃伅銆�
* @return 濡傛灉鏄渶瑕佽繃婊ょ殑瀵硅薄锛屽垯杩斿洖true锛涘惁鍒欒繑鍥瀎alse銆�
*/
--
Gitblit v1.9.3