用户权限调整 岗位功能调整完成

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java

@@ -52,10 +52,13 @@ public interface ISysPositionService {
      * @return
      */
     @ApiOperation(value = "查询所有岗位信息")
-    List listSysPosition();
+    List<SysPosition> listSysPosition();
+
+    @ApiOperation(value = "查询岗位信息",notes = "根据岗位编码查询岗位信息")
+    List<SysPosition> findSysPositionByOrganizeCode(String organizeCode);
 
     @ApiOperation(value = "根据组织代码获取岗位列表")
-    List findSysPositionList(SysPosition position);
+    List<SysPosition> findSysPositionList(SysPosition position);
 
     /**
      * 复杂查询

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

@@ -73,22 +73,16 @@ public class SysMemTreeController extends CoreBaseController {
     @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点")
     public ResultBean listSysPositionParentId() {
         try {
-            List list = positionService.listSysPosition();
-            List listTree = memTreeService.packTreeSysPosition(list, CommonEnumUtil.PARENT.DEFAULT.getValue());
-
-            if (AuthUtil.getUserType().getValue() == CommonEnumUtil.USER_TYPE.USER.getValue()) {
+            List<SysPosition> result = null;
 
-                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);
+            if (AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN.getValue())) {
+                result = positionService.listSysPosition();
+            }else{
+                result = positionService.findSysPositionByOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
             }
+
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                    .setResultList(memTreeService.packTreeSysPosition(result, CommonEnumUtil.PARENT.DEFAULT.getValue()));
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){

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

@@ -140,6 +140,28 @@ public class SysPositionController extends CoreBaseController {
     }
 
     /**
+     * 查询所有岗位
+     * @return 处理结果
+     */
+    @GetMapping(value = "/list-user")
+    @ApiOperation(value = "查询所有岗位", notes = "查询所有岗位")
+    public ResultBean findSysPositionListUser(SysPosition position) {
+        try {
+            List<SysPosition> result = null;
+            if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.USER)){
+                position.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
+            }
+            result = positionService.findSysPositionList(position);
+
+            return ResultBean.success("操作成功").setResultList(result).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
+    /**
      * 查询岗位
      * @param position 查询条件
      * @param pager 分页信息
@@ -149,23 +171,20 @@ public class SysPositionController extends CoreBaseController {
     @ApiOperation(value = "查询岗位", notes = "复杂查询岗位带分页")
     public ResultBean querySysPosition(SysPosition position, Pager pager) {
         try {
-            List<SysRefUserPosition> refList = personnelService.findSysRefUserPositionById(getSessionUser().getUserInfo().getId());
-            if(refList != null && refList.size() > 0){
-                List<Long> idList = new ArrayList<>();
-
-                if(position.getParentId() != null){
-                    idList = memTreeService.findSysPositionChildIdList(position.getParentId());
-                }else{
-                    for (SysRefUserPosition ref : refList) {
-                        idList.add(ref.getPositionId());
-                    }
-                }
-
-                ListPager<SysPosition> listPager = positionService.querySysPosition(position,idList, pager);
-                return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            ListPager<SysPosition> listPager = null;
+
+            List<Long> idList = new ArrayList<>();
+            if(position.getParentId() != null){
+                idList = memTreeService.findSysPositionChildIdList(position.getParentId());
             }
 
-            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            if(!AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){
+                position.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
+            }
+
+            listPager = positionService.querySysPosition(position,idList, pager);
+
+            return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);
         } catch (Exception e) {

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java

@@ -99,7 +99,8 @@ public class CoreMemTreeService implements ICoreMemTreeService {
         if(position != null && position.getChildList() != null && position.getChildList().size() > 0){
             for (SysPosition sp : position.getChildList()) {
                 result.add(sp.getId());
-                result.addAll(findChildSysPosition(sp));
+                List<Long> list = findChildSysPosition(sp);
+                result.addAll(list);
             }
         }
 
@@ -112,8 +113,7 @@ public class CoreMemTreeService implements ICoreMemTreeService {
         if(position != null){
             List<SysPosition> list = personnelService.findSysPositionList();
             if(list != null && list.size() > 0){
-                List<SysPosition> treeList = packTreeSysPosition(list, CommonEnumUtil.PARENT.DEFAULT.getValue());
-                SysPosition treeSPosition = packTreeSysPositionById(treeList, position.getId());
+                SysPosition treeSPosition = packTreeSysPositionById(list, position.getId());
                 List<Long> idList = findChildSysPosition(treeSPosition);
                 idList.add(position.getId());
                 return idList;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java

@@ -146,6 +146,12 @@ public class SysPositionService implements ISysPositionService {
     }
 
     @Override
+    public List<SysPosition> findSysPositionByOrganizeCode(String organizeCode) {
+        LOGGER.info("岗位信息 SysPosition list");
+        return positionRDao.findByHqlWhere(DdlPackBean.getDdlPackBean(organizeCode));
+    }
+
+    @Override
     public List findSysPositionList(SysPosition position) {
         LOGGER.info("岗位信息 SysPosition By position:{}",position);
         return positionRDao.findByHqlWhere(CoreHqlPack.packHqlSysPositionList(position));