From a88499d10c73cec26007521544a8eff8f6dca75e Mon Sep 17 00:00:00 2001
From: Eric <xplzv@126.com>
Date: Fri, 27 Aug 2021 11:30:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=A1=B5=E9=9D=A2=20=E5=8A=A8=E4=BD=9C=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataZTree/index.vue | 2 +-
 src/store/getters.js                   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue
index 2f4b3301c..f0ff204b4 100644
--- a/src/components/AutoDataZTree/index.vue
+++ b/src/components/AutoDataZTree/index.vue
@@ -40,7 +40,7 @@ export default {
           autoParam: ['id=key', 'name=n', 'level=lv'],
           type: 'get',
           headers: {
-            'X-JMS-ORG': this.$store.getters.currentOrg.id
+            'X-JMS-ORG': this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : ''
           }
         },
         callback: {
diff --git a/src/store/getters.js b/src/store/getters.js
index d7225ac71..ecff83379 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -4,7 +4,9 @@ const getters = {
   token: state => state.users.token,
   currentOrg: state => state.users.currentOrg,
   currentOrgIsDefault: state => state.users.currentOrg['is_default'],
-  currentOrgIsRoot: state => state.users.currentOrg['is_root'],
+  currentOrgIsRoot: state => {
+    return state.users.currentOrg && state.users.currentOrg['is_root']
+  },
   currentRole: state => state.users.currentRole,
   currentUser: state => state.users.profile,
   permission_routes: state => state.permission.routes,