From dd07a9215cf2296884b00d2bab15e3dcbe56180a Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 19 Jul 2024 18:47:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB):=20?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StandardInterpretFlowServiceImpl.java     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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 7f8aa69e..d4db1e83 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
@@ -253,11 +253,14 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                 LawsDocumentSplit lawsDocumentSplit = new LawsDocumentSplit();
                 // 属性拷贝
                 BeanUtils.copyProperties(standardInterpretClauseSublist, lawsDocumentSplit);
+                lawsDocumentSplit.setItemNum(null);
+                lawsDocumentSplit.setItemTitle(null);
+                lawsDocumentSplit.setItemContent(null);
                 LawsDomesticStandard lawsDomesticStandard =
                         lawsDomesticStandardService.getById(standardInterpretClauseSublist.getClauseId());
                 if (!Objects.isNull(lawsDomesticStandard)){
                     // 标准
-                    lawsDocumentSplit.setStandardId(standardInterpretDTO.getProcessStandardInterpret().getStandardId());
+                    lawsDocumentSplit.setStandardId(lawsDomesticStandard.getId());
                     lawsDocumentSplit.setFileType(
                             standardInterpretDTO.getProcessStandardInterpret().getDecompositionSource());
                     HashMap<String, Object> parameter = new HashMap<>();
@@ -267,14 +270,15 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                     List<Map<String, Object>> maps = documentSplitService.queryDocumentSplitDetailByList(parameter);
                     if (CollectionUtils.isNotEmpty(maps)){
                         lawsDocumentSplit.setId(String.valueOf(maps.get(0).get("id")));
+                        lawsDocumentSplitMapper.updateById(lawsDocumentSplit);
+                    }else {
+                        lawsDocumentSplitMapper.insert(lawsDocumentSplit);
                     }
                 }else {
+                    // 条款
                     lawsDocumentSplit.setId(standardInterpretClauseSublist.getClauseId());
+                    lawsDocumentSplitMapper.updateById(lawsDocumentSplit);
                 }
-                lawsDocumentSplit.setItemNum(null);
-                lawsDocumentSplit.setItemTitle(null);
-                lawsDocumentSplit.setItemContent(null);
-                lawsDocumentSplitMapper.updateById(lawsDocumentSplit);
             }
             // 同步标准主计划
             lawsStandardMasterPlanService.syncInterpretationOfRegulations(processStandardInterpret.getId(),