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

REQ-2924-修复查询人员报错问题

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

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

@ -5,10 +5,10 @@ import cn.axzo.karma.client.model.request.ListFlowTaskAssignerReq;
import cn.axzo.karma.client.model.response.FlowTaskAssignerResp; import cn.axzo.karma.client.model.response.FlowTaskAssignerResp;
import cn.axzo.workflow.common.enums.ApproverSpecifyEnum; import cn.axzo.workflow.common.enums.ApproverSpecifyEnum;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner;
import cn.axzo.workflow.common.model.response.bpmn.model.BpmnModelDetailVO; import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessDefinitionVO;
import cn.axzo.workflow.common.model.response.category.CategoryItemVO; import cn.axzo.workflow.common.model.response.category.CategoryItemVO;
import cn.axzo.workflow.core.deletage.approverscope.ApproverScopeDTO; import cn.axzo.workflow.core.deletage.approverscope.ApproverScopeDTO;
import cn.axzo.workflow.core.service.BpmnProcessModelService; import cn.axzo.workflow.core.service.BpmnProcessDefinitionService;
import cn.axzo.workflow.core.service.CategoryService; import cn.axzo.workflow.core.service.CategoryService;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -42,7 +42,7 @@ public class BasedRoleTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelec
private CategoryService categoryService; private CategoryService categoryService;
@Autowired @Autowired
private BpmnProcessModelService bpmnProcessModelService; private BpmnProcessDefinitionService bpmnProcessDefinitionService;
@Override @Override
public String getType() { public String getType() {
@ -63,8 +63,8 @@ public class BasedRoleTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelec
@Override @Override
protected List<BpmnTaskDelegateAssigner> invokeService(FlowElement flowElement, DelegateExecution execution, protected List<BpmnTaskDelegateAssigner> invokeService(FlowElement flowElement, DelegateExecution execution,
ApproverScopeDTO scopeDto) { ApproverScopeDTO scopeDto) {
BpmnModelDetailVO detailVO = bpmnProcessModelService.getById(execution.getProcessDefinitionId(), null); BpmnProcessDefinitionVO processDefinition = bpmnProcessDefinitionService.getProcessDefinition(execution.getProcessDefinitionId());
Optional<CategoryItemVO> categoryItemVO = categoryService.get(BPM_MODEL_CATEGORY, detailVO.getKey()); Optional<CategoryItemVO> categoryItemVO = categoryService.get(BPM_MODEL_CATEGORY, processDefinition.getKey());
Map<String, Object> variables = execution.getVariables(); Map<String, Object> variables = execution.getVariables();
ListFlowTaskAssignerReq req = ListFlowTaskAssignerReq.builder() ListFlowTaskAssignerReq req = ListFlowTaskAssignerReq.builder()
.procInstId(execution.getProcessInstanceId()) .procInstId(execution.getProcessInstanceId())