Commit 5c7515cf authored by lenboo's avatar lenboo
Browse files

fix sub process worker group id is 0

parent cd2ad0c3

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

+8 −2
Original line number Diff line number Diff line
@@ -115,12 +115,18 @@ public class ProcessInstanceService extends BaseDAGService { 
            return checkResult;

        }

        ProcessInstance processInstance = processDao.findProcessInstanceDetailById(processId);

        String workerGroupName = "";

        if(processInstance.getWorkerGroupId() == -1){

            processInstance.setWorkerGroupName(DEFAULT);

            workerGroupName = DEFAULT;

        }else{

            WorkerGroup workerGroup = workerGroupMapper.queryById(processInstance.getWorkerGroupId());

            processInstance.setWorkerGroupName(workerGroup.getName());

            if(workerGroup != null){

                workerGroupName = DEFAULT;

            }else{

                workerGroupName = workerGroup.getName();

            }

        }

        processInstance.setWorkerGroupName(workerGroupName);

        ProcessDefinition processDefinition = processDao.findProcessDefineById(processInstance.getProcessDefinitionId());

        processInstance.setReceivers(processDefinition.getReceivers());

        processInstance.setReceiversCc(processDefinition.getReceiversCc());

escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java

+2 −1
Original line number Diff line number Diff line
@@ -493,7 +493,8 @@ public class ProcessDao extends AbstractBaseDao { 
        processInstance.setProcessInstanceJson(processDefinition.getProcessDefinitionJson());

        // set process instance priority

        processInstance.setProcessInstancePriority(command.getProcessInstancePriority());

        processInstance.setWorkerGroupId(command.getWorkerGroupId());

        int workerGroupId = command.getWorkerGroupId() == 0 ? -1 : command.getWorkerGroupId();

        processInstance.setWorkerGroupId(workerGroupId);

        processInstance.setTimeout(processDefinition.getTimeout());

        processInstance.setTenantId(processDefinition.getTenantId());

        return processInstance;