diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java index 7eaa0c8..83ebb2f 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java @@ -52,7 +52,7 @@ public interface ISysPositionService { * @return */ @ApiOperation(value = "查询所有岗位信息") - List listSysPosition(); + List findSysPositionAll(); @ApiOperation(value = "查询岗位信息",notes = "根据岗位编码查询岗位信息") List findSysPositionByOrganizeCode(String organizeCode); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java index 5c00a51..ac477fc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java @@ -681,7 +681,7 @@ public class DemoTestingController { @ApiOperation(value = "用户数据", notes = "用户数据") public void testUserDetailModel() { List roleList = roleService.findSysRoleAll(); - List positionList = positionService.listSysPosition(); + List positionList = positionService.findSysPositionAll(); List departmentList = departmentService.listSysDepartment(); for (int l = 0; l < 100; l++) { @@ -798,7 +798,7 @@ public class DemoTestingController { public void testUserInfo() throws Exception { String PATH = new String(File.separator + "C:\\test\\user"); List roleList = roleService.findSysRoleAll(); - List positionList = positionService.listSysPosition(); + List positionList = positionService.findSysPositionAll(); List departmentList = departmentService.listSysDepartment(); List userList = new ArrayList<>(); 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 bd50fe1..b6e27ce 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 @@ -52,7 +52,7 @@ public class SysMemTreeController extends CoreBaseController { @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点") public ResultBean listSysPositionTree() { try { - List list = positionService.listSysPosition(); + List list = positionService.findSysPositionAll(); List treeList = memTreeService.packTreeSysPosition(list, CommonEnumUtil.PARENT.DEFAULT.getValue()); return ResultBean.success("查询部门树成功") @@ -75,8 +75,8 @@ public class SysMemTreeController extends CoreBaseController { try { List result = null; - if (AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN.getValue())) { - result = positionService.listSysPosition(); + if (AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { + result = positionService.findSysPositionAll(); }else{ result = positionService.findSysPositionByOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); } @@ -99,7 +99,7 @@ public class SysMemTreeController extends CoreBaseController { @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点") public ResultBean listSysPositionParentId(Long[] ids) { try { - List list = positionService.listSysPosition(); + List list = positionService.findSysPositionAll(); List listTree = memTreeService.packTreeSysPosition(list, CommonEnumUtil.PARENT.DEFAULT.getValue()); if (AuthUtil.getUserType().getValue() == CommonEnumUtil.USER_TYPE.USER.getValue()) { @@ -129,7 +129,7 @@ public class SysMemTreeController extends CoreBaseController { @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点") public ResultBean listSysPositionById(Long id) { try { - List list = positionService.listSysPosition(); + List list = positionService.findSysPositionAll(); SysPosition position = memTreeService.packTreeSysPositionById(list,id); return ResultBean.success("查询部门树成功") @@ -151,7 +151,7 @@ public class SysMemTreeController extends CoreBaseController { @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树,-1为根节点") public ResultBean listSysPositionChild(Long id) { try { - List list = positionService.listSysPosition(); + List list = positionService.findSysPositionAll(); SysPosition position = memTreeService.packTreeSysPositionById(list,id); return ResultBean.success("查询部门树成功") diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java index 1b3946e..4241829 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java @@ -140,9 +140,9 @@ public class SysPositionService implements ISysPositionService { @Override @ApiOperation(value = "新增岗位信息") - public List listSysPosition() { + public List findSysPositionAll() { LOGGER.info("岗位信息 SysPosition list"); - return positionRDao.list(); + return positionRDao.findAll(); } @Override