平台数据树修复

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

@@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.model.platform.CommonTreeModel;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import cn.estsh.i3plus.pojo.platform.repository.SysRefUserPositionRepository;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ResultBean;
@@ -76,12 +77,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("查询部门树成功")
+            if (AuthUtil.getUserType().getValue() == CommonEnumUtil.USER_TYPE.USER.getValue()) {
-                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+
-                    .setResultList(userTreeList);
+                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){
@@ -100,10 +109,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("查询部门树成功")
+            if (AuthUtil.getUserType().getValue() == CommonEnumUtil.USER_TYPE.USER.getValue()) {
-                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                List dataListTree = memTreeService.packTreeSysPositionByIds(listTree, Arrays.asList(ids));
-                    .setResultList(dataListTree);
+                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){
@@ -160,15 +177,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){
@@ -177,11 +200,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<SysRefUserDepartment> refList = personnelService.findSysRefUserDepartmentByUserId(getSessionUser().getUser().getId());