diff --git a/README.md b/README.md index c6f48b2bc3..19c1d2e45b 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Easy Scheduler - [**升级文档**](https://analysys.github.io/easyscheduler_docs_cn/升级文档.html?_blank "升级文档") -- 我要体验 普通用户登录：demo/demo123 +- 我要体验 更多文档请参考 easyscheduler中文在线文档 diff --git a/docs/zh_CN/README.md b/docs/zh_CN/README.md index 8e4cb08a4c..ff6b0cc04f 100644 --- a/docs/zh_CN/README.md +++ b/docs/zh_CN/README.md @@ -43,7 +43,7 @@ Easy Scheduler - [**升级文档**](https://analysys.github.io/easyscheduler_docs_cn/升级文档.html?_blank "升级文档") -- 我要体验 普通用户登录：demo/demo123 +- 我要体验 更多文档请参考 easyscheduler中文在线文档 diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java index e0ab90185d..291c59ea22 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java @@ -701,17 +701,19 @@ public class ResourcesService extends BaseService { if (checkAdmin(loginUser, result)) { return result; } - List resourceList = resourcesMapper.queryResourceExceptUserId(userId); - Set resourceSet = null; + List list ; if (resourceList != null && resourceList.size() > 0) { - resourceSet = new HashSet<>(resourceList); - + Set resourceSet = new HashSet<>(resourceList); List authedResourceList = resourcesMapper.queryAuthorizedResourceList(userId); getAuthorizedResourceList(resourceSet, authedResourceList); + list = new ArrayList<>(resourceSet); + }else { + list = new ArrayList<>(0); } - result.put(Constants.DATA_LIST, new ArrayList<>(resourceSet)); + + result.put(Constants.DATA_LIST, list); putMsg(result,Status.SUCCESS); return result; } diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/model/ErrorCommand.java b/escheduler-dao/src/main/java/cn/escheduler/dao/model/ErrorCommand.java index 3f839c5868..cdf144f16b 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/model/ErrorCommand.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/model/ErrorCommand.java @@ -102,6 +102,7 @@ public class ErrorCommand { public ErrorCommand(Command command, String message){ + this.id = command.getId(); this.commandType = command.getCommandType(); this.executorId = command.getExecutorId(); this.processDefinitionId = command.getProcessDefinitionId(); diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue index e0e6297307..818765dae1 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue @@ -59,7 +59,6 @@ this._handleDefineUser(res) this.isSpin = false }).catch(e => { - this.msg = e.msg || 'error' this.isSpin = false }) }, diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue index f8f11d7180..4d5d923ac2 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue @@ -2,7 +2,7 @@