From 35044f232eff6229f15d500d1167611ceac03675 Mon Sep 17 00:00:00 2001
From: Mr-wang <m17852465079@163.com>
Date: Mon, 10 Jul 2023 20:26:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=BF=9E=E7=BA=BF=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/PublishFormBeforeSaveEvent.java       | 11 +++++++++--
 .../pal/repository/web/CoeProcessLevelWeb.java  | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java
index a02265fc..8d1f07b0 100644
--- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java
+++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java
@@ -259,12 +259,15 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
         StringBuilder sbs = new StringBuilder();
         List<String> list_linker = new LinkedList<>();
         //连线数据增加
+        JSONObject json = new JSONObject(new LinkedHashMap<>());
         for (JSONObject o : elements_fei) {
             String shapeId = o.getString("id");
 
             String shapeName = o.getString("name");
+            String title = o.getString("title");
             if (!shapeName.equals("linker")) {
                 list_linker.add(shapeId);
+                json.put(shapeId,title);
             }
         }
 
@@ -298,7 +301,6 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
                     sb6.append("\""+title+"\"").append("连线没有出线");
                     list_linker.add("\""+title+"\""+"连线没有出线");
                 }
-                continue;
             }
             //System.out.println("m的值>>>>>>>>>>>" + ms);
         }
@@ -306,8 +308,13 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int
 //System.out.println("linker>>>>>>>>>>>>" + list_linker.size());
         if (list_linker.size() > 0) {
             sbs.append("连线校验:");
-            sbs.append(sb6);
+            for (String d :
+                    list_linker) {
+                String name = json.getString(d);
+                sb6.append(name).append("没有连线");
+            }
             sb6.append("校验未通过,请检查模型是否都已连线!");
+            sbs.append(sb6);
         }
         if (sbs.length()>0){
             throw new BPMNError("0313", sbs.toString());
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
index 5935dea7..2d15c72d 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
@@ -9510,12 +9510,14 @@ public class CoeProcessLevelWeb extends ActionWeb {
 		List<String> list_linker = new LinkedList<>();
 		List<JSONObject> resultLists = new ArrayList<>();
 		List<JSONObject> elements_fei = ShapeUtil.getShapeJsonToJsonObject2(obj);
+		JSONObject jsonObjects = new JSONObject(new LinkedHashMap<>());
 		for (JSONObject o : elements_fei) {
 			String shapeId = o.getString("id");
-
 			String shapeName = o.getString("name");
+			String title = o.getString("title");
 			if (!shapeName.equals("linker")) {
 				list_linker.add(shapeId);
+				jsonObjects.put(shapeId,title);
 			}
 		}
 
@@ -9549,24 +9551,25 @@ public class CoeProcessLevelWeb extends ActionWeb {
 					sb6.append("\""+title+"\"").append("连线没有出线");
 					list_linker.add("\""+title+"\""+"连线没有出线");
 				}
-				continue;
 			}
+
 			//System.out.println("m的值>>>>>>>>>>>" + ms);
 		}
-
+		System.out.println("剩余的list是什么>>>>>>>>>>"+list_linker.toString());
 //System.out.println("linker>>>>>>>>>>>>" + list_linker.size());
 		if (list_linker.size() > 0) {
 			sb.append("<span>连线校验<span><br/>");
-			ResponseObject ros = ResponseObject.newOkResponse();
 			for (String d :
 					list_linker) {
-				JSONObject tmp = new JSONObject();
-				tmp.put("shapeId", d);
+				String name = jsonObjects.getString(d);
+				sb6.append(name).append("没有连线");
 			}
-			sb.append(sb6);
 			sb6.append("校验未通过,请检查模型是否都已连线!");
+			sb.append(sb6);
 		}
 
+		System.out.println("sb>>>>>>>>>>>"+sb);
+
 		/***************************************************数据属性校验*************************************************/
 
 		Map<String, PALMethodAttributeModel> methodAttributeModelMap = new HashMap<>();