From feb0ce8ee2d41ddaa6d9446fc67e02d9a54750ed Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Fri, 25 Sep 2026 15:21:22 +0800
Subject: [PATCH] =?UTF-8?q?mk=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transport/mk/MkProcessMessageService.java        | 11 ++++-------
 .../impl/CustomerArchivePublicProcessService.java    | 12 +++++-------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mk/MkProcessMessageService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/mk/MkProcessMessageService.java
index 7ca1ad3d..b73885a1 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mk/MkProcessMessageService.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mk/MkProcessMessageService.java
@@ -10,7 +10,6 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.process.feign.IBusinessProcessClient;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -129,14 +128,12 @@ public class MkProcessMessageService {
 		if (!"20".equals(firstText(info, "fdProcessStatus"))) {
 			return false;
 		}
-		if (hasItems(info.get("currentHandlers"))) {
+		Object historyHandlerInfos = asMap(info.get("fdTaskInfo")).get("historyHandlerInfos");
+		if (!(historyHandlerInfos instanceof List<?> historyList) || historyList.isEmpty()) {
 			return false;
 		}
-		return !hasItems(asMap(info.get("fdTaskInfo")).get("handlerInfos"));
-	}
-
-	private static boolean hasItems(Object value) {
-		return value instanceof Collection<?> collection && !collection.isEmpty();
+		Object lastHandler = historyList.get(historyList.size() - 1);
+		return "N6".equals(firstText(asMap(lastHandler), "nodeNumber"));
 	}
 
 	private void applyProcessResult(IMkProcessBizHandler handler, String bizType, String bizIdText,
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchivePublicProcessService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchivePublicProcessService.java
index 56a22a3d..85b5615f 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchivePublicProcessService.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchivePublicProcessService.java
@@ -15,9 +15,9 @@ import org.springblade.process.feign.IBusinessProcessClient;
 import org.springblade.transport.service.ICustomerArchiveService;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -120,14 +120,12 @@ public class CustomerArchivePublicProcessService {
 		if (!"20".equals(firstText(info, "fdProcessStatus"))) {
 			return false;
 		}
-		if (hasItems(info.get("currentHandlers"))) {
+		Object historyHandlerInfos = asMap(info.get("fdTaskInfo")).get("historyHandlerInfos");
+		if (!(historyHandlerInfos instanceof List<?> historyList) || historyList.isEmpty()) {
 			return false;
 		}
-		return !hasItems(asMap(info.get("fdTaskInfo")).get("handlerInfos"));
-	}
-
-	private static boolean hasItems(Object value) {
-		return value instanceof Collection<?> collection && !collection.isEmpty();
+		Object lastHandler = historyList.get(historyList.size() - 1);
+		return "N6".equals(firstText(asMap(lastHandler), "nodeNumber"));
 	}
 
 	private void applyProcessResult(String customerIdText, String processId, Map<String, Object> formValues,