Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java

@@ -75,12 +75,20 @@ public class SysMemTreeController extends CoreBaseController {
         try {
             List list = positionService.listSysPosition();
             List listTree = memTreeService.packTreeSysPosition(list, CommonEnumUtil.PARENT.DEFAULT.getValue());
-            List<SysRefUserPosition> refList = personnelService.findSysRefUserPositionById(getSessionUser().getUserInfo().getId());
-            List userTreeList = memTreeService.packTreeSysPositionBySysRefUserPosition(listTree, refList);
 
-            return ResultBean.success("查询部门树成功")
-                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
-                    .setResultList(userTreeList);
+            if (AuthUtil.getUserType().getValue() == CommonEnumUtil.USER_TYPE.USER.getValue()) {
+
+                List<SysRefUserPosition> refList = personnelService.findSysRefUserPositionById(getSessionUser().getUserInfo().getId());
+                List userTreeList = memTreeService.packTreeSysPositionBySysRefUserPosition(listTree, refList);
+
+                return ResultBean.success("查询部门树成功")
+                        .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                        .setResultList(userTreeList);
+            } else {
+                return ResultBean.success("查询部门树成功")
+                        .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                        .setResultList(listTree);
+            }
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){
@@ -99,10 +107,18 @@ public class SysMemTreeController extends CoreBaseController {
         try {
             List list = positionService.listSysPosition();
             List listTree = memTreeService.packTreeSysPosition(list, CommonEnumUtil.PARENT.DEFAULT.getValue());
-            List dataListTree = memTreeService.packTreeSysPositionByIds(listTree, Arrays.asList(ids));
-            return ResultBean.success("查询部门树成功")
-                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
-                    .setResultList(dataListTree);
+
+            if (AuthUtil.getUserType().getValue() == CommonEnumUtil.USER_TYPE.USER.getValue()) {
+                List dataListTree = memTreeService.packTreeSysPositionByIds(listTree, Arrays.asList(ids));
+                return ResultBean.success("查询部门树成功")
+                        .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                        .setResultList(dataListTree);
+            } else {
+                return ResultBean.success("查询部门树成功")
+                        .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                        .setResultList(listTree);
+            }
+
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){
@@ -159,15 +175,21 @@ public class SysMemTreeController extends CoreBaseController {
      * @return
      */
     @GetMapping(value="/organize/user")
-    @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点")
+    @ApiOperation(value="查询组织树",notes="通过部门主键获取组织树，-1为根节点")
     public ResultBean findSysOrganizeByUser() {
         try {
             List<SysOrganize> list = personnelService.findSysOrganizeList();
             List listTree = memTreeService.packTreeSysOrganize(list, CommonEnumUtil.PARENT.DEFAULT.getValue());
-            List<SysRefUserDepartment> refList = personnelService.findSysRefUserDepartmentByUserId(getSessionUser().getUser().getId());
-            List userTreeList = memTreeService.packTreeSysOrganizeBySysRefUserOrganize(listTree, refList);
 
-            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(userTreeList);
+            if (AuthUtil.getUserType().getValue() == CommonEnumUtil.USER_TYPE.USER.getValue()) {
+                List<SysRefUserDepartment> refList = personnelService.findSysRefUserDepartmentByUserId(getSessionUser().getUser().getId());
+                List userTreeList = memTreeService.packTreeSysOrganizeBySysRefUserOrganize(listTree, refList);
+
+                return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(userTreeList);
+            } else {
+                return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(listTree);
+            }
+
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){
@@ -176,11 +198,11 @@ public class SysMemTreeController extends CoreBaseController {
     }
 
     /**
-     * 根据用户ID 获取用户组织树
+     * 根据用户ID 获取用户部门树
      * @return
      */
     @GetMapping(value="/organize-department/user")
-    @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点")
+    @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树，-1为根节点")
     public ResultBean findTreeModelUser() {
         try {
             List<CommonTreeModel> result = null;