From 94868b345d1f9f275828b88785368809d1684137 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Tue, 9 May 2023 09:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20=E5=B9=B6=E8=A1=8C?=
 =?UTF-8?q?=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/todocenter/handle/WithDrawHandle.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/handle/WithDrawHandle.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/handle/WithDrawHandle.java
index 383af22..9f50b6d 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/handle/WithDrawHandle.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/handle/WithDrawHandle.java
@@ -81,16 +81,22 @@ public class WithDrawHandle {
                 .filter(c -> !NodeTypeEnum.CC.name().equals(c.getNodeType().name()))
                 .collect(Collectors.toList());
 
+        if (CollUtil.isEmpty(currentProgressInfo)){
+            return Boolean.FALSE;
+        }
+
         //1.判断出 当前审批人和上一个审批人 如果传了taskid
         ProgressNode progressNode = StringUtils.isBlank(param.getTaskId()) ?
                 currentProgressInfo.get(currentProgressInfo.size() - 1)
             : findSubNodeByTaskId(param.getTaskId(),currentProgressInfo);
-        ProgressNode beforeProgressNode = null;
-        ProgressNode currentProgressNode = null;
 
-        if (CollUtil.isEmpty(currentProgressInfo)){
+        if (Objects.isNull(progressNode)){
             return Boolean.FALSE;
         }
+
+        ProgressNode beforeProgressNode = null;
+        ProgressNode currentProgressNode = null;
+
         // 说明当前节点是子流程节点
         // 如果是会签 或签 当前和上个
         List<ProgressNode> thisAndOr = Lists.newArrayList();