合并分支 'fix_foton_20230613' 到 'master'

更名流程的触发

查看合并请求 laws-foton-slrs/foton-wkflow-rest!56
This commit is contained in:
高嵩
2023-06-28 17:11:14 +08:00
@@ -269,23 +269,27 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
String[] split = esIdMesg.split(","); String[] split = esIdMesg.split(",");
for (String esById : split){ for (String esById : split){
if(esId.equals(esById)){ if(esId.equals(esById)){
//webServiceOAService.deleteOAByPid(newData.getPId()); webServiceOAService.deleteOAByPid(newData.getPId());
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(newData.getPId()).singleResult(); ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(newData.getPId()).singleResult();
if(processInstance!=null) { if(processInstance!=null) {
runtimeService.deleteProcessInstance(newData.getPId(), "原始数据已被更改"); runtimeService.deleteProcessInstance(newData.getPId(), "原始数据已被更改");
//更名流程 在这里有删除的情况下才进行发送没有则不发送 //更名流程 在这里有删除的情况下才进行发送没有则不发送
log = esIdMesg; log = esIdMesg;
}else {
log = esIdMesg;
} }
} }
} }
}else { }else {
if(esId.equals(esIdMesg)){ if(esId.equals(esIdMesg)){
//webServiceOAService.deleteOAByPid(newData.getPId()); webServiceOAService.deleteOAByPid(newData.getPId());
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(newData.getPId()).singleResult(); ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(newData.getPId()).singleResult();
if(processInstance!=null) { if(processInstance!=null) {
runtimeService.deleteProcessInstance(newData.getPId(), "原始数据已被更改"); runtimeService.deleteProcessInstance(newData.getPId(), "原始数据已被更改");
//更名流程 在这里有删除的情况下才进行发送没有则不发送 //更名流程 在这里有删除的情况下才进行发送没有则不发送
log = esIdMesg; log = esIdMesg;
}else {
log = esIdMesg;
} }
} }
} }