From cd696c36da0d8300d5e9741e1fa531995ba6d8d7 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 17:53:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=AF=BC=E5=85=A5=E6=8B=86?= =?UTF-8?q?=E5=88=86=E7=BB=93=E6=9E=9C=E6=A0=87=E5=87=86=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E6=A0=91=E6=9F=A5=E8=AF=A2=E5=AD=90=E9=9B=86=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 48fb2e18..4bd74645 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1288,12 +1288,25 @@ public class LawsCommonServiceImpl implements ILawsCommonService { public IPage getManyStandardSelectionBox(ManyStandardSelectionBoxVO selectionBoxVO, Integer pageNo, Integer pageSize) { if (StringUtils.isNotBlank(selectionBoxVO.getStandardSystem())) { List list = Arrays.asList(selectionBoxVO.getStandardSystem().split(",")); - List lawsNodeRelationList = lawsNodeRelationService.list( - new LambdaQueryWrapper().in(LawsNodeRelation::getNodeId, list)); - if (CollectionUtils.isNotEmpty(lawsNodeRelationList)) { - String ids = lawsNodeRelationList.stream() - .map(LawsNodeRelation::getUniqueRelationFlag).collect(Collectors.joining(",")); - selectionBoxVO.setIds(ids); + List lawsTreeNodeList = lawsTreeNodeService.listByIds(list); + if (!CollectionUtils.isEmpty(lawsTreeNodeList)) { + List nodeCode = lawsTreeNodeList.stream() + .map(LawsTreeNode::getNodeCode).collect(Collectors.toList()); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.and(o->{ + for (int i = 0; i < nodeCode.size(); i++) { + o.likeRight(LawsNodeRelation::getNodeCode, nodeCode.get(i)); + if(i != (nodeCode.size() - 1)){ + o.or(); + } + } + }); + List lawsNodeRelationListAll = lawsNodeRelationService.list(query); + if(!CollectionUtils.isEmpty(lawsNodeRelationListAll)){ + String ids = lawsNodeRelationListAll.stream().map(LawsNodeRelation::getUniqueRelationFlag) + .collect(Collectors.joining(",")); + selectionBoxVO.setIds(ids); + } } else { return new Page<>(); }