From 540b1faca07e8ecd0aa4964494b398af57eeed95 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Thu, 4 Jul 2019 16:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=91DEMO=20=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/busi/SysMemTreeController.java      | 22 +++++++++++++++++++++-
 .../serviceimpl/busi/CoreMemTreeService.java       |  1 +
 2 files changed, 22 insertions(+), 1 deletion(-)

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<SysPosition> childList = packTreeSysPositionByIds(position.getChildList(), ids);
                     if(ids.contains(position.getId()) || childList != null && childList.size() > 0){
+                        position.setChildList(childList);
                         result.add(position);
                     }
                 }