From 470c41b57224611da481c3bdc23ebf08c1221a84 Mon Sep 17 00:00:00 2001 From: zhourui Date: Tue, 10 Nov 2020 17:30:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0splitValue=E5=80=BC=E7=9A=84?= =?UTF-8?q?=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processor/merge/MergeProcessor.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/merge/MergeProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/merge/MergeProcessor.java index f0d040fafe..f741c9ea7c 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/merge/MergeProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/merge/MergeProcessor.java @@ -66,11 +66,24 @@ public class MergeProcessor extends AbstractMergeProcessor { Work branch = this.findWorkBranch(aeiObjects); if (null != branch) { aeiObjects.getWork().setSplitting(true); + // 回滚splitTokenList aeiObjects.getWork().setSplitTokenList(ListUtils.longestCommonSubsequence( aeiObjects.getWork().getSplitTokenList(), branch.getSplitTokenList())); + // 回滚splitToken aeiObjects.getWork().setSplitToken(aeiObjects.getWork().getSplitTokenList() .get(aeiObjects.getWork().getSplitTokenList().size() - 1)); - aeiObjects.getWork().setSplitValue(""); + // 回滚splitValueList + if (aeiObjects.getWork().getSplitValueList().size() > aeiObjects.getWork().getSplitTokenList().size()) { + aeiObjects.getWork().setSplitValueList(aeiObjects.getWork().getSplitValueList().subList(0, + aeiObjects.getWork().getSplitTokenList().size())); + } + // 回滚splitValue + if (aeiObjects.getWork().getSplitValueList().size() > 0) { + aeiObjects.getWork().setSplitValue(aeiObjects.getWork().getSplitValueList() + .get(aeiObjects.getWork().getSplitValueList().size() - 1)); + } else { + aeiObjects.getWork().setSplitValue(""); + } results.add(aeiObjects.getWork()); } else { // 完全找不到合并的文档,唯一一份 -- GitLab