Commit f84b1574191610803681f0c70d64b7c20a5af750
Committed by
Gitee
Gitee
!87 数据权限中的空值处理
Merge pull request !87 from sproutcat/master
Showing
1 changed file
with
3 additions
and
0 deletions
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
| @@ -79,6 +79,9 @@ public class DataScopeAspect | @@ -79,6 +79,9 @@ public class DataScopeAspect | ||
| 79 | } | 79 | } |
| 80 | // 获取当前的用户 | 80 | // 获取当前的用户 |
| 81 | LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest()); | 81 | LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest()); |
| 82 | + if (loginUser == null) { | ||
| 83 | + return; | ||
| 84 | + } | ||
| 82 | SysUser currentUser = loginUser.getUser(); | 85 | SysUser currentUser = loginUser.getUser(); |
| 83 | if (currentUser != null) | 86 | if (currentUser != null) |
| 84 | { | 87 | { |