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

fix: 移除节点参数，预测节点审批人是否配置在后端逻辑中实现

This commit is contained in:
lizhixian 2025-02-18 14:13:49 +08:00
parent 1f6f00164a
commit 23ed5b780f
3 changed files with 6 additions and 14 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,9 +41,4 @@ public class BpmProcessInstanceCreateReqDTO {
*/ */
private Map<String, List<Long>> startUserSelectAssignees; private Map<String, List<Long>> startUserSelectAssignees;
/**
* 活动节点列表 createProcessInstance弃用时可移除
*/
private List<String> nodeIds;
} }

3
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java
View File

@ -21,7 +21,4 @@ public class BpmProcessInstanceCreateReqVO {
@Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}") @Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}")
private Map<String, List<Long>> startUserSelectAssignees; private Map<String, List<Long>> startUserSelectAssignees;
@Schema(description = "活动节点列表", requiredMode = Schema.RequiredMode.REQUIRED)
private List<String> nodeIds;
} }

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

@ -612,7 +612,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.getNodeIds()); createReqVO.getStartUserSelectAssignees());
} }
@Override @Override
@ -624,13 +624,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.getNodeIds()); createReqDTO.getStartUserSelectAssignees());
}); });
} }
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, List<String> nodeIds) { Map<String, List<Long>> startUserSelectAssignees) {
// 1.1 校验流程定义 // 1.1 校验流程定义
if (definition == null) { if (definition == null) {
throw exception(PROCESS_DEFINITION_NOT_EXISTS); throw exception(PROCESS_DEFINITION_NOT_EXISTS);
@ -648,7 +648,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, nodeIds); validateStartUserSelectAssignees(definition, startUserSelectAssignees);
// 2. 创建流程实例 // 2. 创建流程实例
if (variables == null) { if (variables == null) {
@ -694,7 +694,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
} }
private void validateStartUserSelectAssignees(ProcessDefinition definition, private void validateStartUserSelectAssignees(ProcessDefinition definition,
Map<String, List<Long>> startUserSelectAssignees, List<String> nodeIds) { Map<String, List<Long>> startUserSelectAssignees) {
// 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);
@ -703,7 +703,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
} }
// 2. 流程发起时要先获取当前流程的预测走向节点，发起时只校验预测的节点发起人自选审批人的审批人和抄送人是否都配置了 // 2. 流程发起时要先获取当前流程的预测走向节点，发起时只校验预测的节点发起人自选审批人的审批人和抄送人是否都配置了
tasks.stream().filter(task -> nodeIds == null || nodeIds.contains(task.getId())).forEach(task -> { tasks.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());