From 3ca2cf682283d3f58be80f678efedbb91260d67c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Sep 2021 15:02:29 +0800
Subject: [PATCH] 从业记录，组织机构类别去除
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 07225c1..96b432a 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.vo.DeptVo;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
@@ -207,10 +208,6 @@
return ForestNodeMerger.merge(baseMapper.securityLazyTree(jurisdiction, parentId));
}
- @Override
- public List<String> selectIn() {
- return baseMapper.selectIn();
- }
/**
* 懒加载获取部门树形结构(包含用户数据)
@@ -296,6 +293,11 @@
@Override
public List<DeptVO> selectInfo() {
- return baseMapper.selectInfo();
+ return ForestNodeMerger.merge(baseMapper.selectInfo());
+ }
+
+ @Override
+ public List<DeptVo> selDeptList() {
+ return baseMapper.selDeptList();
}
}
--
Gitblit v1.9.3