From a0a24f8e3fb54f8757e65cde23129c61b930fa6c Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Fri, 15 Jul 2022 16:33:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug=20#55699=20=E3=80=90WELINK=E3=80=91?=
 =?UTF-8?q?=E5=BB=B6=E6=9C=9F=20=E5=AE=A1=E5=AE=9A=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=89=8B=E6=9C=BA=E7=AB=AF=E7=82=B9=E5=87=BB=E5=90=8C?=
 =?UTF-8?q?=E6=84=8F=E6=B2=A1=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessStep2After.java                    | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java
index b10d9b10..331fdf5a 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java
@@ -9,10 +9,13 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
+import net.sf.json.JSONArray;
+import net.sf.json.util.JSONTokener;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class ProcessStep2After implements TaskListener {
@@ -60,16 +63,24 @@ public class ProcessStep2After implements TaskListener {
             }
         }
         String type=object.getString("type");
+        String bussSort = "";
+        Object json = new JSONTokener(object.getString("bussSort")).nextValue();
+        if(json instanceof JSONArray) {
+            bussSort = object.getJSONArray("bussSort").get(0).toString();
+        }else{
+            bussSort = object.getString("bussSort");
+        }
+
         if ("5".equals(type)){
-            prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项";
+            prcName=bussSort+"-"+object.getString("esName")+"-计划立项";
         }else if ("2".equals(type)){
-            prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期";
+            prcName=bussSort+"-"+object.getString("esName")+"-计划延期";
         }else if ("1".equals(type)){
-            prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并";
+            prcName=bussSort+"-"+object.getString("esName")+"-计划合并";
         }else if ("3".equals(type)){
-            prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消";
+            prcName=bussSort+"-"+object.getString("esName")+"-计划取消";
         }else {
-            prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名";
+            prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名";
         }
         //截止时间 流程描述 创建人
         String user = delegateTask.getVariable("prcCreateUser", String.class);
@@ -114,4 +125,12 @@ public class ProcessStep2After implements TaskListener {
             }
         }
     }
+    public static boolean isJson(String string) {
+        try {
+            JSONObject.parseObject(string);
+            return  true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 }