From fc14568e98d4559f22c79d77a2eb544c16a97b04 Mon Sep 17 00:00:00 2001 From: wang1 <844966816@qq.com> Date: 星期四, 15 六月 2023 15:55:00 +0800 Subject: [PATCH] 修复人员列表,租户组为空列表加载异常的bug --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java index d18b139..3b2866c 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java @@ -80,7 +80,8 @@ @Override public List<DeptVO> tree(String tenantId) { - return ForestNodeMerger.merge(baseMapper.tree(tenantId)); + List<DeptVO> tree = baseMapper.tree(tenantId); + return ForestNodeMerger.merge(tree); } @Override -- Gitblit v1.9.3