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,