From 5c5c5483a1275c5a22ea5b408a7a7118eec9ba73 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 16 Aug 2024 15:44:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9B=B6=E9=83=A8=E4=BB=B6=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=AD=90=E7=BA=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/standard/service/impl/PartNameServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java index 9354f0c1..be338fc3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java @@ -2,16 +2,13 @@ package com.jero.modules.laws.standard.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; -import com.jero.modules.laws.standard.entity.LawsTreeNode; import com.jero.modules.laws.standard.entity.PartName; import com.jero.modules.laws.standard.entity.TreePage; -import com.jero.modules.laws.standard.service.PartNameService; import com.jero.modules.laws.standard.mapper.PartNameMapper; +import com.jero.modules.laws.standard.service.PartNameService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -299,7 +296,8 @@ public class PartNameServiceImpl extends ServiceImpl Set rootNodeCodes = rootNodes.stream().map(PartName::getCode).collect(Collectors.toSet()); rootNodes.forEach(node -> { node.setLeafFlag(matchedNodes.stream() - .noneMatch(n -> rootNodeCodes.contains(n.getParentCode()))); + .noneMatch(n -> (rootNodeCodes.contains(n.getParentCode()) && + n.getParentCode().equals(node.getCode())))); }); return new ArrayList<>(rootNodes);