Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0

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)) {
+    if (checkAdmin(loginUser, result)) {
-//      return 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)) {
+//    if (checkAdmin(loginUser, result)) {
-      return result;
+//      return result;
-    }
+//    }
 
     List<Tenant> resourceList = tenantMapper.queryAllTenant();
     result.put(Constants.DATA_LIST, resourceList);

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
           })