test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-05 05:38:30 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge pull request #502 from lenboo/dev-1.1.0

Browse Source 
update tenant in ui
This commit is contained in:
bao liang 2019-07-02 15:09:56 +08:00 committed by GitHub
commit d5aff2be3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java
View File

@ -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);

2
escheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
View File

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