From 4c465dd2c65e2553337c6eec6176a7f122d65a01 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 24 Jul 2024 17:05:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/service/ProcessNodeService.java  | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java
index b74bd437..f2ce0ccd 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java
@@ -29,10 +29,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.jero.modules.activiti.common.ActivitiCommon.DISTRIBUTE;
@@ -150,18 +147,20 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
         if (processDefinitionId.contains(ProcessType.STANDARD_COMPLIANCE_CHECK.getProcessKey())) {
             specialProcessScc(processNodeList, processInstanceId);
         }
-        // 制修订流程特殊处理
+
         if (processDefinitionId.contains(ProcessType.STANDARD_INTERPRET.getProcessKey())) {
             ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
                     .eq(ProcessAll::getProcessInstanceId, processInstanceId)
                     .ne(ProcessAll::getPrcStatus, ProcessStatusEnum.WITHDRAWN.getValue()), false);
-            ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne(
-                    new LambdaQueryWrapper<ProcessStandardInterpret>()
-                            .eq(ProcessStandardInterpret::getProjectId, processAll.getProjectId()));
-            if (!String.valueOf(StandardInterpretCommon.IS_DISTRIBUTE_1)
-                    .equals(processStandardInterpret.getDistribute())){
-                processNodeList.removeIf(v ->
-                        StandardInterpretCommon.MASTER_INTERPRET_SUMMARY.equals(v.getXmlNodeId()));
+            if (!Objects.isNull(processAll)){
+                ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne(
+                        new LambdaQueryWrapper<ProcessStandardInterpret>()
+                                .eq(ProcessStandardInterpret::getProjectId, processAll.getProjectId()));
+                if (!String.valueOf(StandardInterpretCommon.IS_DISTRIBUTE_1)
+                        .equals(processStandardInterpret.getDistribute())){
+                    processNodeList.removeIf(v ->
+                            StandardInterpretCommon.MASTER_INTERPRET_SUMMARY.equals(v.getXmlNodeId()));
+                }
             }
         }
         return processNodeList;