From 6f94da52dea6822000c5937fc3cc1fbd7b8ee0f4 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Tue, 6 Aug 2024 11:18:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(88103):=20=E4=B8=8D=E5=88=86=E5=8F=91?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E4=BC=9A=E7=AD=BE=E8=8A=82=E7=82=B9=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/service/ProcessAllService.java      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
index 08bc23ac..6de6dc72 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
@@ -30,6 +30,8 @@ import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.standardComplianceCheck.common.ProcessStandardComplianceCheckConstants;
 import com.jero.modules.activiti.process.standardinterpret.common.StandardInterpretCommon;
+import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret;
+import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService;
 import com.jero.modules.activiti.util.ActivityCountersign;
 import com.jero.modules.activiti.util.SpringContextUtil;
 import com.jero.modules.activiti.vo.DelegateTaskParam;
@@ -91,6 +93,8 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
     private ProcessNodeLinkService processNodeLinkService;
     @Resource
     private ManagementService managementService;
+    @Resource
+    private ProcessStandardInterpretService processStandardInterpretService;
 
     private static final List<Integer> INSPECT_PROCESS = Arrays.asList();
     public ProcessAll getByProcessInstanceId(String processInstanceId){
@@ -318,6 +322,7 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
         String taskId = param.getTaskId();
         String userId = param.getUserId();
         Integer prcType = param.getPrcType();
+        String projectId = param.getProjectId();
 
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         String processInstanceId = task.getProcessInstanceId();
@@ -335,6 +340,17 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
             throw new JeroBootException("数据不存在");
         }
         String xmlNodeId = record.getNodeId();
+        // 解读流程特殊处理
+        if (ProcessTypeEnum.STANDARD_INTERPRET.getValue().equals(prcType)){
+            ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne(
+                    new LambdaQueryWrapper<ProcessStandardInterpret>()
+                            .eq(ProcessStandardInterpret::getProjectId, param.getProjectId()), false);
+            if (Objects.nonNull(processStandardInterpret)
+                    && StandardInterpretCommon.IS_DISTRIBUTE_2.equals(processStandardInterpret.getDistribute())){
+                // 未分发
+                xmlNodeId = xmlNodeId.replace("2", "1");
+            }
+        }
         LambdaQueryWrapper<ProcessNode> queryProcessNode = new LambdaQueryWrapper<>();
         queryProcessNode.eq(ProcessNode::getProcessDefinitionId,processDefinitionId);
         queryProcessNode.eq(ProcessNode::getXmlNodeId,xmlNodeId);