Commit 37b2fd4789e50c646a3839fd31231d39d131eec4

Authored by lizhixian
1 parent b2ca2630

feat:调整字段名称

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
@@ -24,7 +24,7 @@ public class BpmTaskApproveReqVO { @@ -24,7 +24,7 @@ public class BpmTaskApproveReqVO {
24 @Schema(description = "变量实例(动态表单)", requiredMode = Schema.RequiredMode.REQUIRED) 24 @Schema(description = "变量实例(动态表单)", requiredMode = Schema.RequiredMode.REQUIRED)
25 private Map<String, Object> variables; 25 private Map<String, Object> variables;
26 26
27 - @Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}")  
28 - private Map<String, List<Long>> startUserSelectAssignees; 27 + @Schema(description = "下一个节点审批人", example = "{nodeId:[1, 2]}")
  28 + private Map<String, List<Long>> nextAssignees;
29 29
30 } 30 }
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
@@ -520,11 +520,11 @@ public class BpmTaskServiceImpl implements BpmTaskService { @@ -520,11 +520,11 @@ public class BpmTaskServiceImpl implements BpmTaskService {
520 if (CollUtil.isNotEmpty(reqVO.getVariables())) { 520 if (CollUtil.isNotEmpty(reqVO.getVariables())) {
521 Map<String, Object> variables = FlowableUtils.filterTaskFormVariable(reqVO.getVariables()); 521 Map<String, Object> variables = FlowableUtils.filterTaskFormVariable(reqVO.getVariables());
522 // 下个节点审批人如果不存在,则由前端传递 522 // 下个节点审批人如果不存在,则由前端传递
523 - if (CollUtil.isNotEmpty(reqVO.getStartUserSelectAssignees())) { 523 + if (CollUtil.isNotEmpty(reqVO.getNextAssignees())) {
524 // 获取实例中的全部节点数据,避免后续节点的审批人被覆盖 524 // 获取实例中的全部节点数据,避免后续节点的审批人被覆盖
525 - Map<String, List<Long>> startUserSelectAssignees = FlowableUtils.getStartUserSelectAssignees(instance.getProcessVariables());  
526 - startUserSelectAssignees.putAll(reqVO.getStartUserSelectAssignees());  
527 - variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES, startUserSelectAssignees); 525 + Map<String, List<Long>> hisProcessVariables = FlowableUtils.getStartUserSelectAssignees(instance.getProcessVariables());
  526 + hisProcessVariables.putAll(reqVO.getNextAssignees());
  527 + variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES, hisProcessVariables);
528 } 528 }
529 runtimeService.setVariables(task.getProcessInstanceId(), variables); 529 runtimeService.setVariables(task.getProcessInstanceId(), variables);
530 taskService.complete(task.getId(), variables, true); 530 taskService.complete(task.getId(), variables, true);