From e217f7c909117c238e1197ec5725f43c99bba66b Mon Sep 17 00:00:00 2001 From: luoweijian <1329394916@qq.com> Date: Fri, 13 Mar 2026 17:42:29 +0800 Subject: [PATCH] bug --- .../domain/service/impl/SearchUserDomainServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/project/ding/domain/service/impl/SearchUserDomainServiceImpl.java b/src/main/java/com/project/ding/domain/service/impl/SearchUserDomainServiceImpl.java index c72442e..f8606e9 100644 --- a/src/main/java/com/project/ding/domain/service/impl/SearchUserDomainServiceImpl.java +++ b/src/main/java/com/project/ding/domain/service/impl/SearchUserDomainServiceImpl.java @@ -1,5 +1,6 @@ package com.project.ding.domain.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -81,11 +82,13 @@ public class SearchUserDomainServiceImpl implements SearchUserDomainService { DepartmentDTO departmentDTO = departmentBaseService.getById(singleDeptId).toDTO(DepartmentDTO::new); List departmentDTOPathList = departmentBaseService.lambdaQuery().in(DepartmentEntity::getId, departmentDTO.getDeptIdPath()).list() .stream().map(departmentEntity -> departmentEntity.toDTO(DepartmentDTO::new)).toList(); - departmentDTOPathList.forEach(depDTO -> - depDTO.setDeptNamePath(new ArrayList<>(Collections.singletonList(depDTO.getName())))); + departmentDTOPathList.forEach(depDTO -> depDTO.setDeptNamePath(new ArrayList<>(Collections.singletonList(depDTO.getName()))) + ); departmentDTOPathList = TreeUtils.buildLongTree(departmentDTOPathList , DepartmentDTO::getId , DepartmentDTO::getParentId , (parentDTO , childrenList) -> { parentDTO.setChildrenList(childrenList); - parentDTO.setLeaf(Boolean.FALSE); + if (CollUtil.isNotEmpty(childrenList)) { + parentDTO.setLeaf(Boolean.FALSE); + } childrenList.forEach(childDTO -> childDTO.getDeptNamePath().addAll(0, parentDTO.getDeptNamePath())); }); departmentDTOPathList = TreeUtils.tree2List(departmentDTOPathList, DepartmentDTO::getChildrenList);