wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-2924-修复NPE问题

Browse Source
This commit is contained in:
yangqicheng 2024-09-19 17:52:36 +08:00
parent 9ea952ca8d
commit e85cf6cde5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleTaskAssigneeSelector.java
View File

@ -16,7 +16,9 @@ import org.flowable.bpmn.model.FlowElement;
import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.DelegateExecution;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@ -69,7 +71,7 @@ public class BasedRoleTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelec
ListFlowTaskAssignerReq req = ListFlowTaskAssignerReq.builder() ListFlowTaskAssignerReq req = ListFlowTaskAssignerReq.builder()
.procInstId(execution.getProcessInstanceId()) .procInstId(execution.getProcessInstanceId())
.procInstType(Integer.valueOf(Objects.requireNonNull(categoryItemVO.map(CategoryItemVO::getWorkspaceTypeCode).orElse(null)))) .procInstType(Integer.valueOf(Objects.requireNonNull(categoryItemVO.map(CategoryItemVO::getWorkspaceTypeCode).orElse(null))))
.orgScopes(scopeDto.getOrgScopes().stream() .orgScopes(CollectionUtils.isEmpty(scopeDto.getOrgScopes()) ? Collections.emptyList() : scopeDto.getOrgScopes().stream()
.map(os -> ListFlowTaskAssignerReq.OrgScope.builder() .map(os -> ListFlowTaskAssignerReq.OrgScope.builder()
.ouId(os.getOuId()) .ouId(os.getOuId())
.nodeId(os.getNodeId()) .nodeId(os.getNodeId())
@ -77,7 +79,7 @@ public class BasedRoleTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelec
.workspaceType(os.getWorkspaceType()) .workspaceType(os.getWorkspaceType())
.build()) .build())
.collect(Collectors.toList())) .collect(Collectors.toList()))
.workerTeamScopes(scopeDto.getWorkerTeamScopes().stream() .workerTeamScopes(CollectionUtils.isEmpty(scopeDto.getWorkerTeamScopes()) ? Collections.emptyList() : scopeDto.getWorkerTeamScopes().stream()
.map(ot -> ListFlowTaskAssignerReq.OrgScope.builder() .map(ot -> ListFlowTaskAssignerReq.OrgScope.builder()
.workspaceId(ot.getWorkspaceId()) .workspaceId(ot.getWorkspaceId())
.ouId(ot.getOuId()) .ouId(ot.getOuId())