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

feat(REQ-3340) - 优化审批同意时，如果未包含表单数据，则主动切换普通的同意

Browse Source
This commit is contained in:
wangli 2025-02-19 17:29:26 +08:00
parent 4e772ed178
commit af44769263
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java
View File

@ -33,6 +33,7 @@ import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.ListUtils;
import org.flowable.form.api.FormInfo;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@ -128,7 +129,11 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
dto.setAttachmentList(tempAttachments);
}
populateUsersAvatar(dto.getApprover());
bpmnProcessTaskService.approveTaskWithForm(dto);
if (CollectionUtils.isEmpty(dto.getFormVariables())) {
bpmnProcessTaskService.approveTask(dto);
} else {
bpmnProcessTaskService.approveTaskWithForm(dto);
}
return success(true);
}
@ -148,6 +153,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
/**
* 获取当前节点可回退节点选项列表
*
* @param taskId 当前任务id
* @return 可选回退节点列表
*/