|
|
@@ -57,8 +57,8 @@ public class SysDeptController extends BaseController
|
|
|
@GetMapping("/list/exclude/{deptId}")
|
|
|
public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
|
|
|
{
|
|
|
- List<SysDept> depts = deptService.selectDeptList(new SysDept());
|
|
|
- depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
|
|
|
+ List<SysOrg> depts = orgService.list();
|
|
|
+ depts.removeIf(d -> d.getId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getPath(), "-"), deptId + ""));
|
|
|
return success(depts);
|
|
|
}
|
|
|
|