diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java index 06dfcd6..03421f6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java @@ -44,7 +44,7 @@ public class SysMemTreeController { private SysRefUserPositionRepository refUserPositionRDao; /** - * 通过部门主键获取岗位树,-1为根节点 + * 根据父节点ID 获取树列表 * @return 处理结果 */ @GetMapping(value="/position/root") @@ -63,6 +63,11 @@ public class SysMemTreeController { } } + /** + * 根据用户ID 获取用户组织树 + * @param userId + * @return + */ @GetMapping(value="/position/userId") @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点") public ResultBean listSysPositionParentId(Long userId) { @@ -81,6 +86,11 @@ public class SysMemTreeController { } } + /** + * 分装树 + * @param ids + * @return + */ @GetMapping(value="/position/ids") @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点") public ResultBean listSysPositionParentId(Long[] ids) { @@ -98,6 +108,11 @@ public class SysMemTreeController { } } + /** + * 获取指定ID 节点的树 , 自动补充跟节点 + * @param id + * @return + */ @GetMapping(value="/position/id") @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点") public ResultBean listSysPositionById(Long id) { @@ -115,6 +130,11 @@ public class SysMemTreeController { } } + /** + * 获取字节点所有的ID + * @param id + * @return + */ @GetMapping(value="/position/child") @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点") public ResultBean listSysPositionChild(Long id) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java index 73154a2..1c1a699 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java @@ -64,6 +64,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { }else{ List childList = packTreeSysPositionByIds(position.getChildList(), ids); if(ids.contains(position.getId()) || childList != null && childList.size() > 0){ + position.setChildList(childList); result.add(position); } }