|
|
@@ -86,11 +86,28 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
|
|
|
List<String> alldep = new ArrayList<>();
|
|
|
List<String> superData = departmentMapper.selectCurrentDeps(managerId);
|
|
|
if (!superData.isEmpty()){
|
|
|
- iterationDep(alldep,superData);
|
|
|
+ List<Department> departments = departmentMapper.selectAllDeps();
|
|
|
+ iterationAllDep(alldep,departments,superData);
|
|
|
+// iterationDep(alldep,superData);
|
|
|
}
|
|
|
return alldep;
|
|
|
}
|
|
|
|
|
|
+ private void iterationAllDep(List<String> alldep, List<Department> departments,List<String> superData) {
|
|
|
+ List<String> deps2 =new ArrayList<>();
|
|
|
+ for (String dep : superData) {
|
|
|
+ if (!alldep.contains(dep)){
|
|
|
+ alldep.add(dep);
|
|
|
+ departments.forEach(e ->{
|
|
|
+ if (e.getSuperId()!=null&&e.getSuperId().equals(dep)){
|
|
|
+ deps2.add(e.getId());
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!deps2.isEmpty())iterationAllDep(alldep,departments,deps2);
|
|
|
+ }
|
|
|
+
|
|
|
private void iterationDep(List<String> alldep, List<String> superData) {
|
|
|
for (String dep : superData) {
|
|
|
if (!alldep.contains(dep)){
|