mirror of https://github.com/elunez/eladmin
修复“查询部门:根据ID获取同级与上级数据”包含禁用数据的问题
parent
854faa3994
commit
a18ad5ab80
|
@ -195,7 +195,7 @@ public class DeptServiceImpl implements DeptService {
|
||||||
depts.addAll(deptRepository.findByPidIsNull());
|
depts.addAll(deptRepository.findByPidIsNull());
|
||||||
return deptMapper.toDto(depts);
|
return deptMapper.toDto(depts);
|
||||||
}
|
}
|
||||||
depts.addAll(deptRepository.findByPid(deptDto.getPid()));
|
depts.addAll(deptRepository.findByPid(deptDto.getPid()).stream().filter(dept -> dept.getEnabled()).collect(Collectors.toList()));
|
||||||
return getSuperior(findById(deptDto.getPid()), depts);
|
return getSuperior(findById(deptDto.getPid()), depts);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue