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

Merge branch 'master' into feature/REQ-2090

Browse Source 
# Conflicts:
#	workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEventListener.java
This commit is contained in:
wangli 2024-03-15 20:50:06 +08:00
commit 1ec4c87c87
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java
View File

@ -135,9 +135,7 @@ public class EngineExecutionStartListener implements ExecutionListener {
BpmnTaskDelegateAssigner dummyApprover = buildDummyAssigner(DUMMY_ASSIGNEE,
DUMMY_ASSIGNEE_TYPE, "dummyApprover");
List<String> dummyAssigneeIdList = new ArrayList<>();
dummyAssigneeIdList.add(dummyApprover.buildAssigneeId());
execution.setVariable(assigneeListVariableName, dummyAssigneeIdList);
assigneeIdList.add(dummyApprover.buildAssigneeId());
execution.setVariable(INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT + currentActivityId, Lists.newArrayList(dummyApprover));

4
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEventListener.java
View File

@ -149,7 +149,7 @@ public class AutoOperatorEventListener implements BpmnTaskEventListener, Ordered
* @param userTask
*/
private void checkApproverEmptyHandle(DelegateTask delegateTask, UserTask userTask) {
if (!StringUtils.hasLength(delegateTask.getAssignee())) {
if (!StringUtils.hasText(delegateTask.getAssignee())) {
BpmnMetaParserHelper.getApproverEmptyHandleType(userTask)
.ifPresent(approverEmptyHandleTypeEnum -> {
switch (approverEmptyHandleTypeEnum) {
@ -186,6 +186,8 @@ public class AutoOperatorEventListener implements BpmnTaskEventListener, Ordered
case autoRejection:
autoReject(delegateTask);
break;
case bizSpecify:
break;
default:
checkApproverEmptyHandle(delegateTask, userTask);
break;