From 37c4e8203d4ac6cc470221c783b3e1b53d66f013 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 23 Aug 2024 17:31:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(89311):=20=E6=A0=87=E5=87=86=E4=B8=BB?=
 =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E4=BA=BA=E9=87=8D=E6=96=B0=E5=88=86=E5=8F=91?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StandardInterpretFlowServiceImpl.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
index a548af27..fc3c2d16 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
@@ -1771,6 +1771,21 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                             processStandardInterpretClauseList) {
                         // 重置状态
                         processStandardInterpretClause.setIsReject(YesOrNoEnum.NO.getValue());
+                        // 重新分发节点特殊处理
+                        if (StandardInterpretCommon.MASTER_INTERPRET_AGAIN_DISTRIBUTE.equals(node)){
+                            String taskId = standardInterpretFlowDTO.getProcessApprovalRecord().getTaskId();
+                            Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+                            String snowflake = String.valueOf(runtimeService.getVariable(task.getExecutionId(),
+                                    StandardInterpretCommon.SNOWFLAKE));
+                            // 分发出去后删除当前snowflake
+                            List<String> snowflakeList =
+                                    new ArrayList<>(Arrays.asList(processStandardInterpretClause.getSnowFlake().split(",")));
+                            if (CollectionUtils.isNotEmpty(snowflakeList)
+                                    && snowflakeList.contains(snowflake)){
+                                snowflakeList.remove(snowflake);
+                                processStandardInterpretClause.setSnowFlake(String.join(",", snowflakeList));
+                            }
+                        }
                     }
                     processStandardInterpretClauseService.saveOrUpdateBatch(processStandardInterpretClauseList);