|
@@ -278,14 +278,16 @@ public class SysDeptController extends BaseController
|
|
|
}
|
|
|
|
|
|
Long id1 = parent1.getId();
|
|
|
- SysDept parent2 = deptService.getParentById(id1);
|
|
|
+ Long parentId1 = parent1.getParentId();
|
|
|
+ SysDept parent2 = deptService.getParentById(parentId1);
|
|
|
if (parent2 == null) {
|
|
|
sysDept.setAncestors(id1 + "");
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
Long id2 = parent2.getId();
|
|
|
- SysDept parent3 = deptService.getParentById(id2);
|
|
|
+ Long parentId2 = parent2.getParentId();
|
|
|
+ SysDept parent3 = deptService.getParentById(parentId2);
|
|
|
if (parent3 == null) {
|
|
|
sysDept.setAncestors(id2 + "," + id1);
|
|
|
continue;
|