|
|
@ -223,12 +223,12 @@ public class SysDepartBoundaryServiceImpl extends ServiceImpl<SysDepartBoundaryM |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//根据当前所属部门id查询下级部门,获取部门所属区域
|
|
|
//根据当前所属部门id查询下级部门,获取部门所属区域
|
|
|
// List<SysDeptVo> deptVoList = deptService.selectSecondByParentId(deptId);
|
|
|
List<SysDeptVo> deptVoList = deptService.selectSecondByParentId(deptId); |
|
|
//
|
|
|
|
|
|
// List<Long> secondDeptIdList = StreamUtils.toList(deptVoList, SysDeptVo::getDeptId);
|
|
|
|
|
|
// secondDeptIdList.add(deptId);
|
|
|
|
|
|
|
|
|
|
|
|
return this.baseMapper.listJson(List.of(deptId)); |
|
|
List<Long> secondDeptIdList = StreamUtils.toList(deptVoList, SysDeptVo::getDeptId); |
|
|
|
|
|
secondDeptIdList.add(deptId); |
|
|
|
|
|
|
|
|
|
|
|
return this.baseMapper.listJson(secondDeptIdList.stream().distinct().toList()); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|