From f84b1574191610803681f0c70d64b7c20a5af750 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期五, 04 九月 2020 14:17:32 +0800
Subject: [PATCH] !87 数据权限中的空值处理 Merge pull request !87 from sproutcat/master
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index 222888c..80c1fda 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -79,6 +79,9 @@
}
// 鑾峰彇褰撳墠鐨勭敤鎴�
LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+ if (loginUser == null) {
+ return;
+ }
SysUser currentUser = loginUser.getUser();
if (currentUser != null)
{
--
Gitblit v1.9.3