From 21f3125855d271c8060c51aad9f3e6cb8f860a6e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 五月 2023 22:19:53 +0800
Subject: [PATCH] 代码被覆盖重新整合上传

---
 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 7db165c..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
@@ -19,7 +19,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.core.log.exception.ServiceException;
+import org.springblade.core.log.exception.ServiceException;
 import com.vci.ubcs.system.cache.SysCache;
 import com.vci.ubcs.system.entity.Dept;
 import com.vci.ubcs.system.mapper.DeptMapper;
@@ -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