|
|
@@ -583,42 +583,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
|
|
|
return sysDeptTreeVos;
|
|
|
}
|
|
|
|
|
|
- private void getSysDeptTreeVos(List<SysDeptTreeVo> sysDeptTree1) {
|
|
|
- for (SysDeptTreeVo deptTreeVo : sysDeptTree1) {
|
|
|
- List<SysDept> sysDept2 = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
|
|
|
- .eq(SysDept::getParentId, deptTreeVo.getId()).eq(SysDept::getDelFlag, 0).isNotNull(SysDept::getComlevel));
|
|
|
- List<SysDeptTreeVo> sysDeptTree2 = BeanUtil.copyToList(sysDept2, SysDeptTreeVo.class);
|
|
|
- deptTreeVo.setChildren(sysDeptTree2);
|
|
|
- if (sysDeptTree2.size()>0) {
|
|
|
- getSysDeptTreeVos(sysDeptTree2);
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public List<SysDeptTreeVo> getSysDeptTreeInfo() {
|
|
|
- SysDept sysDept = getById("9");
|
|
|
- LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper<>();
|
|
|
- lqw.eq(SysDept::getDelFlag, 0);
|
|
|
- lqw.isNotNull(SysDept::getComlevel);
|
|
|
- lqw.likeRight(SysDept::getId, "9");
|
|
|
- lqw.orderByAsc(SysDept::getOrderNum);
|
|
|
- List<SysDept> sysDeptList = list(lqw);
|
|
|
- SysDeptTreeVo sysDeptTreeVo = BeanUtil.copyProperties(sysDept, SysDeptTreeVo.class);
|
|
|
- List<SysDeptTreeVo> sysDeptTreeVos = BeanUtil.copyToList(sysDeptList, SysDeptTreeVo.class);
|
|
|
- sysDeptTreeVos.add(sysDeptTreeVo);
|
|
|
- Map<String, List<SysDeptTreeVo>> map = sysDeptTreeVos.stream().sorted(Comparator.comparing(SysDeptTreeVo::getId)).collect(Collectors.groupingBy(SysDeptTreeVo::getParentId));
|
|
|
- sysDeptTreeVos.forEach(i -> {
|
|
|
- i.setChildren(map.getOrDefault(i.getId(), new ArrayList<>()));
|
|
|
- i.setDeptCount(i.getChildren().size());
|
|
|
- });
|
|
|
- sysDeptTreeVos = map.get(sysDept.getParentId());
|
|
|
-
|
|
|
-
|
|
|
- return sysDeptTreeVos;
|
|
|
- }
|
|
|
|
|
|
}
|
|
|
|