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

update - 优化选人代码结构

Browse Source
This commit is contained in:
wangli 2024-02-06 15:32:39 +08:00
parent e6fdda940d
commit 97c988804f
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java
View File

@ -81,7 +81,7 @@ public abstract class AbstractBpmnTaskAssigneeSelector implements BpmnTaskAssign
Assert.notNull(result, "服务调用异常");
// 200自定义处理
if (HttpStatus.HTTP_OK != result.getCode()) {
throw new WorkflowEngineException(CALC_TASK_ASSIGNEE_ERROR, result.getMsg());
throw new WorkflowEngineException(CALC_TASK_ASSIGNEE_ERROR, "[API:]" + result.getMsg());
}
return result.getData();
}

3
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AdminTaskAssigneeSelector.java
View File

@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@ -69,7 +68,7 @@ public class AdminTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector
"通过管理员查询审批人", req);
if (CollUtil.isEmpty(flowTaskAssigners)) {
return Collections.emptyList();
return super.invokeService(userTask, execution, scopeDto);
}
return BeanUtil.copyToList(flowTaskAssigners, BpmnTaskDelegateAssigner.class);
}

3
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/PositionTaskAssigneeSelector.java
View File

@ -15,7 +15,6 @@ import org.flowable.engine.delegate.DelegateExecution;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@ -63,7 +62,7 @@ public class PositionTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelect
"审批节点: " + userTask.getId() + ", 通过岗位查询审批人", req);
if (CollUtil.isEmpty(flowTaskAssigners)) {
return Collections.emptyList();
return super.invokeService(userTask, execution, scopeDto);
}
return BeanUtil.copyToList(flowTaskAssigners, BpmnTaskDelegateAssigner.class);
}

3
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/RoleTaskAssigneeSelector.java
View File

@ -15,7 +15,6 @@ import org.flowable.engine.delegate.DelegateExecution;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@ -70,7 +69,7 @@ public class RoleTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
.collect(Collectors.toList());
if (CollUtil.isEmpty(flowTaskAssigners)) {
return Collections.emptyList();
return super.invokeService(userTask, execution, scopeDto);
}
return flowTaskAssigners.stream().map(u -> BpmnTaskDelegateAssigner.builder()
.assignee(String.valueOf(u.getIdentityId()))