From 7337f33b393c3206448e586f978c54e58d971a57 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 18 Jul 2024 10:23:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20scc=E6=B5=81=E7=A8=8B=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessStandardComplianceCheckServiceImpl.java     |  7 +++++++
 .../activiti/service/ProcessApprovalRecordService.java |  2 +-
 .../modules/activiti/service/ProcessNodeService.java   | 10 ++++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index d341e1c0..6b91b827 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -251,6 +251,11 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
         String xmlNodeId = record.getNodeId();
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
+        BasicProcessInfoDTO processInfo = new BasicProcessInfoDTO();
+        // 使用流程引擎根据taskId找到流程实例Id
+        String mainInstanceId = (String) taskService.getVariable(taskId, MAIN_INSTANCE_ID);
+        processInfo.setProcessInstanceId(mainInstanceId);
+        processInfoVO.setBasicProcessInfoDTO(processInfo);
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(processTask, taskId);
         String curUserId = UserUtils.getUserId();
@@ -376,6 +381,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         actFlowCommonService.updateApprovalInfo(processTask, taskId);
         // 删除草稿
         actFlowCommonService.removeDraft(curUserId, taskId, processInstanceId);
+        // 保存快照
+        processHandleService.saveToSnapshot(processInfoVO, curUserId);
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
index 09bd763b..1c39a040 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
@@ -61,7 +61,7 @@ public class ProcessApprovalRecordService extends ServiceImpl<ProcessApprovalRec
     }
 
     public Page<ProcessApprovalRecord> pageList(Page<ProcessApprovalRecord> page, ProcessApprovalRecord processApprovalRecord, String type, HttpServletRequest req) {
-        boolean allSnapshotFlag = !type.equals(COMPLETED_RECORD_LIST);
+        boolean allSnapshotFlag = type.equals(ALL_RECORD_LIST);
         String curUserId = UserUtils.getUserId();
         QueryWrapper<ProcessApprovalRecord> wrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(processApprovalRecord.getFinishFlagSearch())){
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 8609fc58..c1a89cf3 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
@@ -1,6 +1,8 @@
 package com.jero.modules.activiti.service;
 
 import cn.hutool.core.collection.CollStreamUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.YesOrNoEnum;
@@ -23,7 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.jero.modules.activiti.common.ActivitiCommon.*;
+import static com.jero.modules.activiti.common.ActivitiCommon.DISTRIBUTE;
 import static com.jero.modules.activiti.process.standardComplianceCheck.common.ProcessStandardComplianceCheckConstants.*;
 
 /**
@@ -130,9 +132,13 @@ public class ProcessNodeService extends ServiceImpl<ProcessNodeMapper, ProcessNo
     }
 
     private void specialProcessScc(List<ProcessNode> processNodeList, String processInstanceId) {
+        if (StrUtil.isBlank(processInstanceId)) {
+            return;
+        }
         // 如果没分发 则不显示 主排查人单线审核 主排查人汇总节点
         String mainInstanceId = (String) runtimeService.getVariable(processInstanceId, ActivitiCommon.MAIN_INSTANCE_ID);
-        boolean distribute = (boolean) runtimeService.getVariable(mainInstanceId, DISTRIBUTE);
+        Object variable = runtimeService.getVariable(mainInstanceId, DISTRIBUTE);
+        boolean distribute = ObjectUtil.isNotNull(variable) && YesOrNoEnum.YES.getValue().equals(variable.toString());
         if (!distribute) {
             processNodeList.removeIf( v -> v.getXmlNodeId().equals(MAIN_CHECK_USER_APPROVAL)
                     || v.getXmlNodeId().equals(MAIN_CHECK_USER_COLLECT));