From 7cb7ede8555f1ee653eb97ed35238fb6673899de Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 28 Nov 2023 17:58:27 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=B5=81=E7=A8=8B=E7=A9=BA=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datas/service/impl/BusProcessNewServiceImpl.java         | 5 ++++-
 .../com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java   | 1 -
 .../ProcessStep4After.java                                   | 2 +-
 3 files changed, 5 insertions(+), 3 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 d999672e..a8018276 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
@@ -269,6 +269,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
              if(StringUtils.isNotBlank(mesg)){
                  JSONObject jsonObject = JSON.parseObject(mesg);
                  String esIdMesg = jsonObject.getString("esId");
+                 if (StringUtils.isBlank(esIdMesg)) {
+                     esIdMesg = jsonObject.getString("nowEsId");
+                 }
                  if (StringUtils.isBlank(esIdMesg)) {
                      return false;
                  }
@@ -279,7 +282,7 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
          String log = "";
          if (busProcessNewList.size()>0) {
              for (BusProcessNew busProcessNew : busProcessNewList) {
-                 webServiceOAService.deleteOAByPid(busProcessNew.getPId());
+//                 webServiceOAService.deleteOAByPid(busProcessNew.getPId());
                  ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(busProcessNew.getPId()).singleResult();
                  if (processInstance != null) {
                      runtimeService.deleteProcessInstance(busProcessNew.getPId(), "原始数据已被更改");
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java
index ae0fe62b..aec9bcad 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java
@@ -193,7 +193,6 @@ public class BussUtils {
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
                 busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
index e1718067..0b777c69 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
@@ -478,7 +478,7 @@ public class ProcessStep4After implements TaskListener {
             }
         }
         if(!"5".equals(type)){
-            delegateTask.setVariable("bzfgbzFlag",2);
+//            delegateTask.setVariable("bzfgbzFlag",2);
             BussUtils.endFunAll(delegateTask, prcName, busBean, object, "0", busProcessNameService, "25");
         }
     }