FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wxyclub
2023-07-05 16:25:35 +08:00
parent 26a1ce7b63 d7b57d31a4
commit 838a35ede4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
+6 -2
View File
@@ -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;
} }
} }
} }