From 9231b5e0ae0b67174973e18a8482809696942e68 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Tue, 12 Sep 2023 11:07:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=A0=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/system/service/impl/DicServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DicServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DicServiceImpl.java index 75c882b1d..8f6371be6 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DicServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DicServiceImpl.java @@ -19,6 +19,7 @@ import com.njcn.user.pojo.param.FunctionParam; import com.njcn.user.pojo.po.Function; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import java.util.Comparator; @@ -83,7 +84,17 @@ public class DicServiceImpl extends ServiceImpl implements IDicS public List getDicTree(String code) { List list = dicMapper.getAllDic(); return list.stream() - .filter(fun -> Objects.equals(TemplateTreeEnum.FATHER_PID,fun.getPid())&&fun.getCode().equals(code)) + .filter(fun -> { + boolean flag =true; + boolean flag1 =true; + flag = Objects.equals(TemplateTreeEnum.FATHER_PID,fun.getPid()); + if(!StringUtils.isEmpty(code)){ + flag1 = fun.getCode().equals(code); + } + + return flag&&flag1; + + }) .peek(funS -> funS.setChildren(getChildList(funS, list))) .sorted(Comparator.comparingInt(DicVO::getSort)) .collect(Collectors.toList());