From a9f3c37b85dddd7e6f1342813060e17309bc93cb Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 12 Apr 2024 09:38:52 +0800
Subject: [PATCH] 控制判断
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 124cd04..bd17e82 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -93,7 +93,7 @@
if (Func.toLong(parentId) == 0L && !AuthUtil.isAdministrator()) {
Long deptId = Func.firstLong(AuthUtil.getDeptId());
Dept dept = SysCache.getDept(deptId);
- if (dept.getParentId() != 0) {
+ if (dept != null && dept.getParentId() != 0) {
parentId = dept.getParentId();
}
List<DeptVO> deptVOS = baseMapper.lazyList(tenantId, parentId, param);
@@ -134,7 +134,7 @@
if (Func.toLong(parentId) == 0L && !AuthUtil.isAdmin()) {
Long deptId = Func.firstLong(AuthUtil.getDeptId());
Dept dept = SysCache.getDept(deptId);
- if (dept.getParentId() != 0) {
+ if (dept != null && dept.getParentId() != 0) {
parentId = dept.getParentId();
}
List<DeptVO> merge = ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId));
--
Gitblit v1.9.3