|
@@ -46,13 +46,13 @@ public class SysDeptController extends BaseController {
|
|
|
//@PreAuthorize("hasAuthority('sys:dept:view')")
|
|
//@PreAuthorize("hasAuthority('sys:dept:view')")
|
|
|
@ApiOperation(value = "获取树结构")
|
|
@ApiOperation(value = "获取树结构")
|
|
|
@GetMapping(value = "/findTree")
|
|
@GetMapping(value = "/findTree")
|
|
|
- public HttpResult<List<SysDept>> findTree() {
|
|
|
|
|
|
|
+ public HttpResult<List<SysDept>> findTree(String deptId,String managementSource) {
|
|
|
BaseController baseController = new BaseController();
|
|
BaseController baseController = new BaseController();
|
|
|
- String deptId = baseController.getDeptId();
|
|
|
|
|
|
|
+// String deptId = baseController.getDeptId();
|
|
|
LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.eq(SysDept::getDelFlag, 0).eq(SysDept::getId, deptId);
|
|
queryWrapper.eq(SysDept::getDelFlag, 0).eq(SysDept::getId, deptId);
|
|
|
SysDept one = sysDeptService.getOne(queryWrapper);
|
|
SysDept one = sysDeptService.getOne(queryWrapper);
|
|
|
- String managementSource = one.getManagementSource();
|
|
|
|
|
|
|
+// String managementSource = one.getManagementSource();
|
|
|
|
|
|
|
|
return HttpResult.ok(sysDeptService.findTree(deptId,managementSource));
|
|
return HttpResult.ok(sysDeptService.findTree(deptId,managementSource));
|
|
|
}
|
|
}
|