From 47b5fb504541541c0c5fbd76629f44c8044fae82 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Fri, 12 May 2023 11:05:22 +0800
Subject: [PATCH] =?UTF-8?q?OA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BusProcessNewServiceImpl.java        | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 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 aacf86df..38011960 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
@@ -266,13 +266,29 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
                  JSONObject jsonObject = JSON.parseObject(newData.getMesg());
                  String esIdMesg = jsonObject.getString("esId");
                  if(StringUtils.isNotBlank(esIdMesg)){
-                     if(esId.equals(esIdMesg)){
-                        //是同一条企标计划 删除当前待办 是否是起草页面
-                         //删除OA待办任务
-                         webServiceOAService.deleteOAByPid(newData.getPId());
-                        // taskService.deleteTask(newData.getTaskId());
-                         runtimeService.deleteProcessInstance(newData.getPId(),"原始数据已被更改");
+                     if(esIdMesg.contains(",")){
+                         String[] split = esIdMesg.split(",");
+                         for (String esById : split){
+                             if(esId.equals(esById)){
+                                 //是同一条企标计划 删除当前待办 是否是起草页面
+                                 //删除OA待办任务
+                                 List<Task> list = taskService.createTaskQuery().processInstanceBusinessKey(newData.getPId()).list();
+                                 if(list.size()>0 ){
+                                     //webServiceOAService.deleteOAByPid(newData.getPId());
+                                     runtimeService.deleteProcessInstance(newData.getPId(),"原始数据已被更改");
+                                 }
+                             }
+                         }
+                     }else {
+                         if(esId.equals(esIdMesg)){
+                             List<Task> list = taskService.createTaskQuery().processInstanceBusinessKey(newData.getPId()).list();
+                             if(list.size()>0){
+                                 //webServiceOAService.deleteOAByPid(newData.getPId());
+                                 runtimeService.deleteProcessInstance(newData.getPId(),"原始数据已被更改");
+                             }
+                         }
                      }
+
                  }
              }
          }