From 9d1cc24e0520811b4bc1bdbf2b2ed1aff0c05475 Mon Sep 17 00:00:00 2001
From: huyuanming <huyuanming1010@163.com>
Date: Tue, 9 Jul 2019 10:38:33 +0800
Subject: [PATCH] remove default tenant

---
 .../pages/security/pages/users/_source/createUser.vue     | 5 ++++-
 escheduler-ui/src/js/conf/home/store/security/actions.js  | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
index 574a995ec..f8f728a0d 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
@@ -184,7 +184,10 @@
       _getTenantList () {
         return new Promise((resolve, reject) => {
           this.store.dispatch('security/getTenantList').then(res => {
-            this.tenantList = _.map(res, v => {
+            let arr = _.filter(res, (o) => {
+              return o.id !== -1
+            })
+            this.tenantList = _.map(arr, v => {
               return {
                 id: v.id,
                 code: v.tenantName
diff --git a/escheduler-ui/src/js/conf/home/store/security/actions.js b/escheduler-ui/src/js/conf/home/store/security/actions.js
index ac3f82d81..ff96adccf 100644
--- a/escheduler-ui/src/js/conf/home/store/security/actions.js
+++ b/escheduler-ui/src/js/conf/home/store/security/actions.js
@@ -241,10 +241,10 @@ export default {
     return new Promise((resolve, reject) => {
       io.get(`tenant/list`, payload, res => {
         let list=res.data
-        // list.unshift({
-        //   id: -1,
-        //   tenantName: 'Default'
-        // })
+        list.unshift({
+          id: -1,
+          tenantName: 'Default'
+        })
         state.tenantAllList = list
         resolve(list)
       }).catch(e => {
-- 
GitLab