From 215dc27c201036bf1291b25b9db0a87077836e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 10 Sep 2024 18:56:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=B7=B2=E5=85=A5=E5=BA=93=E6=96=87=E6=9C=AC=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=A0=87=E5=87=86=E7=BB=93=E6=9E=84=E6=A0=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DocumentSplitServiceImpl.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index f5ebdb3f..b6579669 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -1480,10 +1480,19 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { if (StringUtils.isNotBlank(splitFileInfo.getStandardSystem())){ List list = Arrays.asList(splitFileInfo.getStandardSystem().split(",")); List lawsTreeNodeList = lawsTreeNodeService.listByIds(list); - List lawsNodeRelationList = lawsNodeRelationService.list(new LambdaQueryWrapper() - .in(LawsNodeRelation::getNodeId, lawsTreeNodeList.stream().map(LawsTreeNode::getId) - .collect(Collectors.toList()))); - if (lawsNodeRelationList.isEmpty()){ + if(CollectionUtils.isEmpty(lawsTreeNodeList)){ + return new Page<>(); + } + List nodeCode = lawsTreeNodeList.stream().map(LawsTreeNode::getNodeCode).collect(Collectors.toList()); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + for (int i = 0; i < nodeCode.size(); i++) { + query.likeRight(LawsNodeRelation::getNodeCode, nodeCode.get(i)); + if(i != nodeCode.size() - 1){ + query.or(); + } + } + List lawsNodeRelationList = lawsNodeRelationService.list(query); + if (CollectionUtils.isEmpty(lawsNodeRelationList)){ return new Page<>(); } List idList = lawsNodeRelationList.stream().map(LawsNodeRelation::getUniqueRelationFlag).collect(Collectors.toList());