fix 修复 查询部门下拉树未过滤数据权限问题
parent
77b8ce65a0
commit
15b5407a25
|
|
@ -1,7 +1,6 @@
|
||||||
package org.dromara.system.service;
|
package org.dromara.system.service;
|
||||||
|
|
||||||
import cn.hutool.core.lang.tree.Tree;
|
import cn.hutool.core.lang.tree.Tree;
|
||||||
import org.dromara.system.domain.SysDept;
|
|
||||||
import org.dromara.system.domain.bo.SysDeptBo;
|
import org.dromara.system.domain.bo.SysDeptBo;
|
||||||
import org.dromara.system.domain.vo.SysDeptVo;
|
import org.dromara.system.domain.vo.SysDeptVo;
|
||||||
|
|
||||||
|
|
@ -35,7 +34,7 @@ public interface ISysDeptService {
|
||||||
* @param depts 部门列表
|
* @param depts 部门列表
|
||||||
* @return 下拉树结构列表
|
* @return 下拉树结构列表
|
||||||
*/
|
*/
|
||||||
List<Tree<Long>> buildDeptTreeSelect(List<SysDept> depts);
|
List<Tree<Long>> buildDeptTreeSelect(List<SysDeptVo> depts);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据角色ID查询部门树信息
|
* 根据角色ID查询部门树信息
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ public class SysDeptServiceImpl implements ISysDeptService{
|
||||||
@Override
|
@Override
|
||||||
public List<Tree<Long>> selectDeptTreeList(SysDeptBo bo) {
|
public List<Tree<Long>> selectDeptTreeList(SysDeptBo bo) {
|
||||||
LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(bo);
|
LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(bo);
|
||||||
List<SysDept> depts = baseMapper.selectList(lqw);
|
List<SysDeptVo> depts = baseMapper.selectDeptList(lqw);
|
||||||
return buildDeptTreeSelect(depts);
|
return buildDeptTreeSelect(depts);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -92,7 +92,7 @@ public class SysDeptServiceImpl implements ISysDeptService{
|
||||||
* @return 下拉树结构列表
|
* @return 下拉树结构列表
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<Tree<Long>> buildDeptTreeSelect(List<SysDept> depts) {
|
public List<Tree<Long>> buildDeptTreeSelect(List<SysDeptVo> depts) {
|
||||||
if (CollUtil.isEmpty(depts)) {
|
if (CollUtil.isEmpty(depts)) {
|
||||||
return CollUtil.newArrayList();
|
return CollUtil.newArrayList();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue