From 429f75778a4fee6d4b76426378ca4498dffba520 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 2 Aug 2024 10:26:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB):=20?=
 =?UTF-8?q?=E8=AF=91=E6=96=87=E6=94=B9=E4=B8=BA=E6=A0=87=E5=87=86=E9=87=8C?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/ProcessStandardInterpretClauseSublistMapper.xml      | 3 ++-
 .../service/impl/StandardInterpretFlowServiceImpl.java       | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml
index 9dbfa1d2..7d9f8fa9 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml
@@ -9,7 +9,7 @@
                 standard_interpret_clause_id,
                 clause_id,
                 interpret_person_id,
-                `translation`,
+                psic2.translation
                 is_same_as_prev_version,
                 change_description,
                 regulatory_notes,
@@ -50,6 +50,7 @@
              IF(lds.id is not null, lds.standard_number, lds2.item_num) itemNum,
              IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle,
              IF(lds.id is not null, null, lds2.item_content)            itemContent,
+             lds2.translation,
              standard_interpret_id
              from process_standard_interpret_clause psic
              left join laws_domestic_standard lds on psic.clause_id = lds.id and lds.del_flag = 0
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 9df0f702..5507ba59 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
@@ -256,6 +256,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                 lawsDocumentSplit.setItemNum(null);
                 lawsDocumentSplit.setItemTitle(null);
                 lawsDocumentSplit.setItemContent(null);
+                lawsDocumentSplit.setTranslation(null);
                 LawsDomesticStandard lawsDomesticStandard =
                         lawsDomesticStandardService.getById(standardInterpretClauseSublist.getClauseId());
                 if (!Objects.isNull(lawsDomesticStandard)){
@@ -467,8 +468,8 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                             // 合并
                             first.setInterpretPersonId(mergeString(first.getInterpretPersonId(),
                                     standardInterpretClauseSublist.getInterpretPersonId()));
-                            first.setTranslation(mergeString(first.getTranslation(),
-                                    standardInterpretClauseSublist.getTranslation()));
+//                            first.setTranslation(mergeString(first.getTranslation(),
+//                                    standardInterpretClauseSublist.getTranslation()));
                             first.setIsSameAsPrevVersion(mergeString(first.getIsSameAsPrevVersion(),
                                     standardInterpretClauseSublist.getIsSameAsPrevVersion()));
                             first.setChangeDescription(mergeString(first.getChangeDescription(),