Commit ef803cc9 authored by dailidong's avatar dailidong
Browse files

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

parents d6ba1026 3efdff3d

README.md

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Easy Scheduler 


- [**升级文档**](https://analysys.github.io/easyscheduler_docs_cn/升级文档.html?_blank "升级文档") 



- <a href="http://52.82.13.76:8888" target="_blank">我要体验</a> 普通用户登录：demo/demo123

- <a href="http://52.82.13.76:8888" target="_blank">我要体验</a> 



更多文档请参考 <a href="https://analysys.github.io/easyscheduler_docs_cn/" target="_blank">easyscheduler中文在线文档</a>

docs/zh_CN/README.md

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Easy Scheduler 


- [**升级文档**](https://analysys.github.io/easyscheduler_docs_cn/升级文档.html?_blank "升级文档") 



- <a href="http://52.82.13.76:8888" target="_blank">我要体验</a> 普通用户登录：demo/demo123

- <a href="http://52.82.13.76:8888" target="_blank">我要体验</a> 



更多文档请参考 <a href="https://analysys.github.io/easyscheduler_docs_cn/" target="_blank">easyscheduler中文在线文档</a>

escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java

+7 −5
Original line number Diff line number Diff line
@@ -701,17 +701,19 @@ public class ResourcesService extends BaseService { 
        if (checkAdmin(loginUser, result)) {

            return result;

        }



        List<Resource> resourceList = resourcesMapper.queryResourceExceptUserId(userId);

        Set<Resource> resourceSet = null;

        List<Object> list ;

        if (resourceList != null && resourceList.size() > 0) {

            resourceSet = new HashSet<>(resourceList);



            Set<Resource> resourceSet = new HashSet<>(resourceList);

            List<Resource> 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;

    }

escheduler-dao/src/main/java/cn/escheduler/dao/model/ErrorCommand.java

+1 −0
Original line number Diff line number Diff line
@@ -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();

escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
        this._handleDefineUser(res)

        this.isSpin = false

      }).catch(e => {

        this.msg = e.msg || 'error'

        this.isSpin = false

      })

    },