|
|
@ -60,9 +60,6 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public List<DeptVO> tree(String tenantId) { |
|
|
|
public List<DeptVO> tree(String tenantId) { |
|
|
|
if (AuthUtil.isAdministrator()) { |
|
|
|
|
|
|
|
tenantId = StringPool.EMPTY; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return ForestNodeMerger.merge(baseMapper.tree(tenantId)); |
|
|
|
return ForestNodeMerger.merge(baseMapper.tree(tenantId)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|