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 queryTenantList(User loginUser, String searchVal, Integer pageNo, Integer pageSize) { Map 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 queryTenantList(User loginUser) { Map result = new HashMap<>(5); - if (checkAdmin(loginUser, result)) { - return result; - } +// if (checkAdmin(loginUser, result)) { +// return result; +// } List resourceList = tenantMapper.queryAllTenant(); result.put(Constants.DATA_LIST, resourceList); 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 })