From 7de0ae810c53185fef47a3efe634a0158291a8eb Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Mon, 15 May 2023 16:37:59 +0800
Subject: [PATCH] =?UTF-8?q?OA=20=E6=94=BE=E5=BC=80=20=E6=96=B9=E4=BE=BF?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BusProcessNewServiceImpl.java        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
index 41a253a1..592c82c8 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
@@ -272,15 +272,24 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
                          String[] split = esIdMesg.split(",");
                          for (String esById : split){
                              if(esId.equals(esById)){
-                                 //是同一条企标计划 删除当前待办 是否是起草页面
-                                 //删除OA待办任务
-                                 //webServiceOAService.deleteOAByPid(newData.getPId());
-                                 runtimeService.deleteProcessInstance(newData.getPId(),"原始数据已被更改");
+                                 if(esId.equals(esIdMesg)){
+                                     webServiceOAService.deleteOAByPid(newData.getPId());
+                                     ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(newData.getPId()).singleResult();
+                                     if(processInstance!=null) {
+                                         runtimeService.deleteProcessInstance(newData.getPId(), "原始数据已被更改");
+                                         //更名流程 在这里有删除的情况下才进行发送没有则不发送
+                                         if(StringUtils.isNotBlank(log)){
+                                             log = 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(), "原始数据已被更改");