From 7d2b9e5925e7a2dd3893409c4f08cfba1428f2f7 Mon Sep 17 00:00:00 2001
From: lenboo <denny1011@163.com>
Date: Tue, 2 Jul 2019 14:58:34 +0800
Subject: [PATCH 1/2] remove the auth for query list.

---
 .../cn/escheduler/api/service/TenantService.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java
index 694266d4ad..555275273f 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java
@@ -125,9 +125,9 @@ public class TenantService extends BaseService{
   public Map<String,Object> queryTenantList(User loginUser, String searchVal, Integer pageNo, Integer pageSize) {
 
     Map<String, Object> result = new HashMap<>(5);
-//    if (checkAdmin(loginUser, result)) {
-//      return result;
-//    }
+    if (checkAdmin(loginUser, result)) {
+      return result;
+    }
 
     Integer count = tenantMapper.countTenantPaging(searchVal);
 
@@ -269,9 +269,9 @@ public class TenantService extends BaseService{
   public Map<String, Object> queryTenantList(User loginUser) {
 
     Map<String, Object> result = new HashMap<>(5);
-    if (checkAdmin(loginUser, result)) {
-      return result;
-    }
+//    if (checkAdmin(loginUser, result)) {
+//      return result;
+//    }
 
     List<Tenant> resourceList = tenantMapper.queryAllTenant();
     result.put(Constants.DATA_LIST, resourceList);

From f55fd51ff2c3aae5b0845d5037023de3c4c6ebb9 Mon Sep 17 00:00:00 2001
From: lenboo <denny1011@163.com>
Date: Tue, 2 Jul 2019 15:07:48 +0800
Subject: [PATCH 2/2] update tenant in ui

---
 .../js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
index 307c2fdc27..9c39e8ec4a 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
@@ -45,7 +45,7 @@
       if (stateTenantAllList.length) {
         this.itemList = stateTenantAllList
       } else {
-        this.store.dispatch('actions/getTenantList').then(res => {
+        this.store.dispatch('security/getTenantList').then(res => {
           this.$nextTick(() => {
             this.itemList = res
           })