Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613

This commit is contained in:
wxyclub
2023-07-05 16:25:35 +08:00
@@ -269,23 +269,27 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
String[] split = esIdMesg.split(",");
for (String esById : split){
if(esId.equals(esById)){
//webServiceOAService.deleteOAByPid(newData.getPId());
webServiceOAService.deleteOAByPid(newData.getPId());
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(newData.getPId()).singleResult();
if(processInstance!=null) {
runtimeService.deleteProcessInstance(newData.getPId(), "原始数据已被更改");
//更名流程 在这里有删除的情况下才进行发送没有则不发送
log = esIdMesg;
}else {
log = esIdMesg;
}
}
}
}else {
if(esId.equals(esIdMesg)){
//webServiceOAService.deleteOAByPid(newData.getPId());
webServiceOAService.deleteOAByPid(newData.getPId());
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(newData.getPId()).singleResult();
if(processInstance!=null) {
runtimeService.deleteProcessInstance(newData.getPId(), "原始数据已被更改");
//更名流程 在这里有删除的情况下才进行发送没有则不发送
log = esIdMesg;
}else {
log = esIdMesg;
}
}
}