|
|
@@ -578,7 +578,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
|
|
|
ProcessDefinition definition = processDefinitionService.getProcessDefinition(createReqVO.getProcessDefinitionId());
|
|
|
// 发起流程
|
|
|
return createProcessInstance0(userId, definition, createReqVO.getVariables(), null,
|
|
|
- createReqVO.getStartUserSelectAssignees());
|
|
|
+ createReqVO.getStartUserSelectAssignees(), null);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -588,13 +588,13 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
|
|
|
ProcessDefinition definition = processDefinitionService.getActiveProcessDefinition(createReqDTO.getProcessDefinitionKey());
|
|
|
// 发起流程
|
|
|
return createProcessInstance0(userId, definition, createReqDTO.getVariables(), createReqDTO.getBusinessKey(),
|
|
|
- createReqDTO.getStartUserSelectAssignees());
|
|
|
+ createReqDTO.getStartUserSelectAssignees(),createReqDTO);
|
|
|
});
|
|
|
}
|
|
|
|
|
|
private String createProcessInstance0(String userId, ProcessDefinition definition,
|
|
|
Map<String, Object> variables, String businessKey,
|
|
|
- Map<String, List<String>> startUserSelectAssignees) {
|
|
|
+ Map<String, List<String>> startUserSelectAssignees, BpmProcessInstanceCreateReqDTO createReqDTO) {
|
|
|
// 1.1 校验流程定义
|
|
|
if (definition == null) {
|
|
|
throw exception(PROCESS_DEFINITION_NOT_EXISTS);
|
|
|
@@ -617,6 +617,11 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
|
|
|
if (variables == null) {
|
|
|
variables = new HashMap<>();
|
|
|
}
|
|
|
+
|
|
|
+ if (createReqDTO != null) {
|
|
|
+ variables.put("equipMainType", createReqDTO.getEquipMainType());
|
|
|
+ }
|
|
|
+
|
|
|
AdminUserRespDTO user = adminUserApi.getUser(userId).getCheckedData();
|
|
|
|
|
|
FlowableUtils.filterProcessInstanceFormVariable(variables); // 过滤一下,避免 ProcessInstance 系统级的变量被占用
|