Merge remote-tracking branch 'origin/feature/REQ-3581' into feature/REQ-3581
This commit is contained in:
commit
a6c97479d0
@ -562,7 +562,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void removeLastRequest(ChangeRecord visa) {
|
private void removeLastRequest(ChangeRecord visa) {
|
||||||
if (!StringUtils.hasText(visa.getContractId())) {
|
if (StringUtils.hasText(visa.getContractId())) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
deleteByVisaId(visa.getId(), Lists.newArrayList(PRINT_PDF_FILE, PROCESS_INSTANCE_OF_ESS));
|
deleteByVisaId(visa.getId(), Lists.newArrayList(PRINT_PDF_FILE, PROCESS_INSTANCE_OF_ESS));
|
||||||
@ -643,7 +643,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
|
|||||||
GetWorkspaceDetailRes entWorkspace = workspaces.get(0);
|
GetWorkspaceDetailRes entWorkspace = workspaces.get(0);
|
||||||
|
|
||||||
BpmnProcessInstanceCreateDTO create = new BpmnProcessInstanceCreateDTO();
|
BpmnProcessInstanceCreateDTO create = new BpmnProcessInstanceCreateDTO();
|
||||||
create.setBusinessKey(String.valueOf(model.getOuId()));
|
create.setBusinessKey(String.valueOf(visa.getId()));
|
||||||
create.setProcessDefinitionKey(refreshableConfiguration.getStampProcessDefinitionKey());
|
create.setProcessDefinitionKey(refreshableConfiguration.getStampProcessDefinitionKey());
|
||||||
List<BpmnTaskDelegateAssigner> assigners = stampUserMap.getOrDefault(model.getOuId(), new ArrayList<>());
|
List<BpmnTaskDelegateAssigner> assigners = stampUserMap.getOrDefault(model.getOuId(), new ArrayList<>());
|
||||||
assigners.forEach(i -> i.setTenantId(String.valueOf(entWorkspace.getId())));
|
assigners.forEach(i -> i.setTenantId(String.valueOf(entWorkspace.getId())));
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user