|
@@ -29,6 +29,7 @@ import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
@@ -183,20 +184,19 @@ public class TmDepartmentServiceImpl extends ServiceImpl<ITmDepartmentMapper, Tm
|
|
|
@Override
|
|
|
public List<TmDepartment> getSonByDeptId(String deptId) {
|
|
|
List<TmDepartment> listAll = new ArrayList<>();
|
|
|
- converSon(deptId,listAll);
|
|
|
+ converSon(Arrays.asList(deptId),listAll);
|
|
|
return listAll;
|
|
|
}
|
|
|
|
|
|
- private void converSon(String deptId, List<TmDepartment> listAll){
|
|
|
+ private void converSon(List<String> deptIds, List<TmDepartment> listAll){
|
|
|
LambdaQueryWrapper<TmDepartment> wrapper = new LambdaQueryWrapper<>();
|
|
|
- wrapper.eq(TmDepartment::getParentId,deptId);
|
|
|
+ wrapper.in(TmDepartment::getParentId,deptIds);
|
|
|
List<TmDepartment> list = this.list(wrapper);
|
|
|
if(list.size() <=0){
|
|
|
return ;
|
|
|
}
|
|
|
listAll.addAll(list);
|
|
|
- for (TmDepartment tmDepartment : list) {
|
|
|
- converSon(tmDepartment.getId(),listAll);
|
|
|
- }
|
|
|
+ List<String> ids = list.stream().map(TmDepartment::getId).collect(Collectors.toList());
|
|
|
+ converSon(ids,listAll);
|
|
|
}
|
|
|
}
|