增加保护

blade-common/src/main/java/org/springblade/common/utils/ForestNodeManagerEx.java

@@ -28,7 +28,7 @@ public class ForestNodeManagerEx<T extends INodeEx<T>> {
     public List<T> getRoot() {
         List<T> roots = new ArrayList();
         this.nodeMap.forEach((key, node) -> {
-            if (node.getParentId() == 0L || this.parentIdMap.containsKey(node.getId())) {
+            if ((node.getParentId() != null && node.getParentId() == 0L) || this.parentIdMap.containsKey(node.getId())) {
                 roots.add(node);
             }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeServiceImpl.java

@@ -88,7 +88,12 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
             throw new ServiceException("根节点已存在,请先删除后再进行初始化");
         }
 
-        List<ArchiveTree> sysTrees = this.treeList(AuthUtil.getTenantId(), 0L, null, null);
+        String tenantId = AuthUtil.getTenantId();
+        if (StringUtils.isEmpty(tenantId)) {
+            tenantId = BladeConstant.ADMIN_TENANT_ID;
+        }
+
+        List<ArchiveTree> sysTrees = this.treeList(tenantId, 0L, null, null);
         if (sysTrees == null || sysTrees.size() == 0) {
             return false;
         }