szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 解决流程预测审批节点错误问题

This commit is contained in:
lizhixian 2025-02-17 16:11:00 +08:00
parent 296e6ab3ad
commit 5e277e020f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java
View File

@ -41,4 +41,9 @@ public class BpmProcessInstanceCreateReqDTO {
*/ */
private Map<String, List<Long>> startUserSelectAssignees; private Map<String, List<Long>> startUserSelectAssignees;
/**
* 活动节点列表 createProcessInstance弃用时可移除
*/
private List<String> nodeIds;
} }

13
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
View File

@ -608,7 +608,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
.getProcessDefinition(createReqVO.getProcessDefinitionId()); .getProcessDefinition(createReqVO.getProcessDefinitionId());
// 发起流程 // 发起流程
return createProcessInstance0(userId, definition, createReqVO.getVariables(), null, return createProcessInstance0(userId, definition, createReqVO.getVariables(), null,
createReqVO.getStartUserSelectAssignees()); createReqVO.getStartUserSelectAssignees(), createReqVO.getNodeIds());
} }
@Override @Override
@ -620,13 +620,13 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
// 发起流程 // 发起流程
return createProcessInstance0(userId, definition, createReqDTO.getVariables(), return createProcessInstance0(userId, definition, createReqDTO.getVariables(),
createReqDTO.getBusinessKey(), createReqDTO.getBusinessKey(),
createReqDTO.getStartUserSelectAssignees()); createReqDTO.getStartUserSelectAssignees(),createReqDTO.getNodeIds());
}); });
} }
private String createProcessInstance0(Long userId, ProcessDefinition definition, private String createProcessInstance0(Long userId, ProcessDefinition definition,
Map<String, Object> variables, String businessKey, Map<String, Object> variables, String businessKey,
Map<String, List<Long>> startUserSelectAssignees) { Map<String, List<Long>> startUserSelectAssignees, List<String> nodeIds) {
// 1.1 校验流程定义 // 1.1 校验流程定义
if (definition == null) { if (definition == null) {
throw exception(PROCESS_DEFINITION_NOT_EXISTS); throw exception(PROCESS_DEFINITION_NOT_EXISTS);
@ -644,7 +644,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
throw exception(PROCESS_INSTANCE_START_USER_CAN_START); throw exception(PROCESS_INSTANCE_START_USER_CAN_START);
} }
// 1.3 校验发起人自选审批人 // 1.3 校验发起人自选审批人
validateStartUserSelectAssignees(definition, startUserSelectAssignees); validateStartUserSelectAssignees(definition, startUserSelectAssignees, nodeIds);
// 2. 创建流程实例 // 2. 创建流程实例
if (variables == null) { if (variables == null) {
@ -690,16 +690,17 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
} }
private void validateStartUserSelectAssignees(ProcessDefinition definition, private void validateStartUserSelectAssignees(ProcessDefinition definition,
Map<String, List<Long>> startUserSelectAssignees) { Map<String, List<Long>> startUserSelectAssignees, List<String> nodeIds) {
// 1. 获得发起人自选审批人的 UserTask/ServiceTask 列表 // 1. 获得发起人自选审批人的 UserTask/ServiceTask 列表
BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(definition.getId()); BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(definition.getId());
List<Task> tasks = BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectTaskList(bpmnModel); List<Task> tasks = BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectTaskList(bpmnModel);
if (CollUtil.isEmpty(tasks)) { if (CollUtil.isEmpty(tasks)) {
return; return;
} }
// 2.流程发起时要先获取当前流程的预测走向节点，发起是
// 2. 校验发起人自选审批人的审批人和抄送人是否都配置了 // 2. 校验发起人自选审批人的审批人和抄送人是否都配置了
tasks.forEach(task -> { tasks.stream().filter(task -> nodeIds == null || nodeIds.contains(task.getId())).forEach(task -> {
List<Long> assignees = startUserSelectAssignees != null ? startUserSelectAssignees.get(task.getId()) : null; List<Long> assignees = startUserSelectAssignees != null ? startUserSelectAssignees.get(task.getId()) : null;
if (CollUtil.isEmpty(assignees)) { if (CollUtil.isEmpty(assignees)) {
throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG, task.getName()); throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG, task.getName());