From f017edcfad775953ad59a2620f820e28376ef6ce Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 26 Jul 2024 13:44:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(87359):=20=E6=A0=87=E5=87=86=E8=A7=A3?=
 =?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B--=E5=8F=91=E8=B5=B7=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9--=E6=9D=A1=E6=AC=BE=E5=BA=94=E8=AF=A5=E6=98=AF?=
 =?UTF-8?q?=E5=8F=AF=E4=B8=BA=E7=A9=BA=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/StandardInterpretCommon.java         |  5 +++++
 .../impl/StandardInterpretFlowServiceImpl.java  | 17 +++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/common/StandardInterpretCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/common/StandardInterpretCommon.java
index df3408e1..874e2433 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/common/StandardInterpretCommon.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/common/StandardInterpretCommon.java
@@ -177,4 +177,9 @@ public class StandardInterpretCommon {
      * 是否下发：1：是 2：否 0：驳回
      */
     public static final Integer IS_DISTRIBUTE_0 = 0;
+
+    /**
+     * 分解单来源：不带入
+     */
+    public static final String NONCARRY = "noncarry";
 }
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 84c2a3a4..dd37df8b 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
@@ -1375,8 +1375,21 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                     processStandardInterpret.setSplitInfoId(sarFileSplitInfoEO.getId());
                 }
                 processStandardInterpretService.saveOrUpdate(processStandardInterpret);
-                // 如果没选择条款
-                if (CollectionUtils.isEmpty(processStandardInterpretClauseList)){
+
+                // 如果选择了不带入
+                if (StandardInterpretCommon.NONCARRY.equals(processStandardInterpret.getDecompositionSource())
+                        && CollectionUtils.isEmpty(processStandardInterpretClauseList)){
+                    processStandardInterpret.setChooseClause(YesOrNoEnum.YES.getValue());
+
+                    ProcessStandardInterpretClause processStandardInterpretClause =
+                            new ProcessStandardInterpretClause();
+                    processStandardInterpretClause.setClauseId(processStandardInterpret.getStandardId());
+                    processStandardInterpretClause.setItemNum(processStandardInterpret.getStandardNumber());
+                    processStandardInterpretClause.setItemTitle(processStandardInterpret.getStandardName());
+                    processStandardInterpretClause.setItemTitle(processStandardInterpret.getStandardName());
+                    processStandardInterpretClauseList.add(processStandardInterpretClause);
+                }else if (CollectionUtils.isEmpty(processStandardInterpretClauseList)){
+                    // 如果没选择条款
                     processStandardInterpret.setChooseClause(YesOrNoEnum.NO.getValue());
                     // 自动保存所有条款
                     processStandardInterpretClauseList =