From e89057e4526084ed1f2c71e064c3ca5a1cc88da3 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 4 Jul 2019 15:46:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=97=A0=E6=B3=95=E5=90=AF?= =?UTF-8?q?=E5=8A=A8,=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ICoreMemTreeService.java | 33 +++++ .../core/api/iservice/busi/ICoreTreeService.java | 25 ++++ .../api/iservice/busi/ISysPositionService.java | 5 +- .../controller/DemoTestingController.java | 1 + .../controller/busi/PersonnelController.java | 1 + .../controller/busi/SysMemTreeController.java | 135 +++++++++++++++++++++ .../serviceimpl/busi/CoreMemTreeService.java | 102 ++++++++++++++++ .../serviceimpl/busi/SysPositionService.java | 22 +++- 8 files changed, 317 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java new file mode 100644 index 0000000..65164b5 --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreMemTreeService.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.platform.bean.SysPosition; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserPosition; +import io.swagger.annotations.ApiOperation; + +import java.util.List; + +/** + * @Description : 通用内存树查询服务 + * @Reference : + * @Author : wei.peng + * @Date : 2018-10-24 11:16 + * @Modify : + **/ +public interface ICoreMemTreeService { + + @ApiOperation(value = "分装岗位树",notes = "分装岗位树") + List packTreeSysPosition(List list,Long parentId); + + @ApiOperation(value = "分装岗位树",notes = "根据用户岗位关系分装岗位树") + List packTreeSysPositionBySysRefUserPosition(List list, List refList); + + @ApiOperation(value = "分装岗位树",notes = "根据制定IDS分装岗位树") + List packTreeSysPositionByIds(List list, List ids); + + @ApiOperation(value = "分装岗位树",notes = "根据制定ID分装岗位树") + SysPosition packTreeSysPositionById(List list, Long id); + + @ApiOperation(value = "查询岗位子节点",notes = "查询字节点岗位ID") + List findChildSysPosition(SysPosition position); + +} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java index 453e72b..d28b503 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java @@ -25,6 +25,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @Deprecated @ApiOperation(value = "获取岗位树",notes = "根据父节点获取岗位树集合") List findSysPositionTreeByParentId(long parentId); @@ -33,6 +34,7 @@ public interface ICoreTreeService { * @param id * @return */ + @Deprecated @ApiOperation(value = "获取岗位树",notes = "根据父节点获取岗位树") SysPosition getSysPositionTreeById(long id); @@ -41,6 +43,7 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @Deprecated @ApiOperation(value = "封装岗位树",notes = "封装当前岗位树") void findSysPositionChildrenTreePack(SysPosition parent,int step); @@ -48,6 +51,7 @@ public interface ICoreTreeService { * 检查父节点是否是子节点ID或者为当前节点ID * @param position */ + @Deprecated @ApiOperation(value = "父节点检查",notes = "检查岗位的父节点是否是当前节点的子节点") void doValidatorSysPositionParentId(SysPosition position) ; @@ -56,6 +60,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @Deprecated @ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树集合") List findSysDepartmentTreeByParentId(long parentId); @@ -64,6 +69,7 @@ public interface ICoreTreeService { * @param id * @return */ + @Deprecated @ApiOperation(value = "获取部门树",notes = "根据父节点获取部门树") SysDepartment getSysDepartmentTreeById(long id); @@ -72,6 +78,7 @@ public interface ICoreTreeService { * @param id 组织ID * @return 部门ID 集合 */ + @Deprecated @ApiOperation(value = "获取部门ID集合",notes = "根据组织ID获取部门子集ID集合") List findSysDepartmentIdByOrganizeId(long id); @@ -80,6 +87,7 @@ public interface ICoreTreeService { * @param department 部门信息 * @return 子集ID 集合 */ + @Deprecated @ApiOperation(value = "获取部门ID集合",notes = "获取部门子集ID集合") List findSysDepartmentChildIds(SysDepartment department); @@ -88,6 +96,7 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @Deprecated @ApiOperation(value = "封装部门树",notes = "封装当前部门树") void findSysDepartmentChildrenTreePack(SysDepartment parent,int step); @@ -95,6 +104,7 @@ public interface ICoreTreeService { * 检查父节点是否是子节点ID或者为当前节点ID * @param department */ + @Deprecated @ApiOperation(value = "父节点检查",notes = "检查部门的父节点是否是当前节点的子节点") void doValidatorSysDepartmentParentId(SysDepartment department) ; @@ -103,6 +113,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @Deprecated @ApiOperation(value = "获取组织树",notes = "根据父节点获取组织树集合") List findSysOrganizeTreeByParentId(long parentId); @@ -111,6 +122,7 @@ public interface ICoreTreeService { * @param organize 组织信息 * @return 组织子集ID集合 */ + @Deprecated @ApiOperation(value = "获取组织子集ID集合",notes = "获取组织子集ID集合") List findSysOrganizeChildIds(SysOrganize organize); @@ -119,6 +131,7 @@ public interface ICoreTreeService { * @param id * @return */ + @Deprecated @ApiOperation(value = "获取组织树",notes = "根据父节点获取组织树") SysOrganize getSysOrganizeTreeById(long id); @@ -127,6 +140,7 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @Deprecated @ApiOperation(value = "封装组织树",notes = "封装当前组织树") void findSysOrganizeChildrenTreePack(SysOrganize parent,int step); @@ -134,6 +148,7 @@ public interface ICoreTreeService { * 检查父节点是否是子节点ID或者为当前节点ID * @param organize */ + @Deprecated @ApiOperation(value = "父节点检查",notes = "检查组织的父节点是否是当前节点的子节点") void doValidatorSysOrganizeParentId(SysOrganize organize) ; @@ -142,6 +157,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @Deprecated @ApiOperation(value = "获取菜单树",notes = "根据父节点获取菜单树集合") List findSysMenuTreeByParentId(long parentId); @@ -150,6 +166,7 @@ public interface ICoreTreeService { * @param id * @return */ + @Deprecated @ApiOperation(value = "获取菜单树",notes = "根据父节点获取菜单树") SysMenu getSysMenuTreeById(long id); @@ -158,6 +175,7 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @Deprecated @ApiOperation(value = "封装菜单树",notes = "封装当前菜单树") void findSysMenuChildrenTreePack(SysMenu parent, int step); @@ -167,6 +185,7 @@ public interface ICoreTreeService { * @param roleId 角色ID * @param step 层级 */ + @Deprecated @ApiOperation(value = "封装菜单树",notes = "根据角色ID封装当前菜单树") void findSysMenuChildrenTreeByRoleIdPack(SysMenu parent,Long roleId, int step); @@ -176,6 +195,7 @@ public interface ICoreTreeService { * @param userId 用户ID * @param step 层级 */ + @Deprecated @ApiOperation(value = "封装菜单树",notes = "根据用户ID封装当前菜单树") void findSysMenuChildrenTreeByUserIdPack(SysMenu parent,Long userId, int step); @@ -185,6 +205,7 @@ public interface ICoreTreeService { * @param cacheMenuList 功能菜单集合 * @param step 层级 */ + @Deprecated @ApiOperation(value = "封装菜单树",notes = "根据用户ID 内存中封装当前菜单树") void findMemSysMenuChildrenTreeByUserIdPack(SysMenu parent, List cacheMenuList, int step); @@ -192,6 +213,7 @@ public interface ICoreTreeService { * 检查父节点是否是子节点ID或者为当前节点ID * @param menu */ + @Deprecated @ApiOperation(value = "父节点检查",notes = "检查菜单的父节点是否是当前节点的子节点") void doValidatorSysMenuParentId(SysMenu menu) ; @@ -200,6 +222,7 @@ public interface ICoreTreeService { * @param parentId * @return */ + @Deprecated @ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树集合") List findOrganizeDepartment(long parentId); @@ -208,6 +231,7 @@ public interface ICoreTreeService { * @param id * @return */ + @Deprecated @ApiOperation(value = "获取组织部门树",notes = "根据父节点获取组织部门树") CommonTreeModel getOrganizeById(long id); @@ -216,6 +240,7 @@ public interface ICoreTreeService { * @param parent 父类对象 * @param step 层级 */ + @Deprecated @ApiOperation(value = "封装菜单树",notes = "封装当前组织部门树") void findOrganizeTreePack(CommonTreeModel parent, int step); 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 d6d13e5..be2a398 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 @@ -51,9 +51,12 @@ public interface ISysPositionService { * 查询所有数据 * @return */ - @ApiOperation(value = "新增岗位信息") + @ApiOperation(value = "查询所有岗位信息") List listSysPosition(); + @ApiOperation(value = "根据组织代码获取岗位列表") + List findSysPositionByOrganizeCode(String organizeCode); + /** * 复杂查询 * @param position 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 69965c2..d8197ff 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 @@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + import javax.annotation.Resource; import javax.persistence.EntityManager; import java.io.BufferedWriter; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index c3b02bd..4d069de 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -206,6 +206,7 @@ public class PersonnelController extends CoreBaseController { userInfo.setUserPoliticalStatus(info.getUserPoliticalStatus()); userInfo.setUserGrade(info.getUserGrade()); userInfo.setUserEmployeeType(info.getUserEmployeeType()); + userInfo.setUserImageId(info.getUserImageId()); sysUser.setUserLoginName(user.getUserLoginName()); sysUser.setLanguageCode(user.getLanguageCode()); 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 new file mode 100644 index 0000000..06dfcd6 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java @@ -0,0 +1,135 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysPosition; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserPosition; +import cn.estsh.i3plus.pojo.platform.repository.SysRefUserPositionRepository; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Arrays; +import java.util.List; + +/** + * @Description : 内存树 + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019-07-04 下午12:52 + * @Modify: + **/ +@RestController +@Api(description = "内存树服务") +@RequestMapping(PlatformConstWords.BASE_URL + "/mem-tree") +public class SysMemTreeController { + + @Autowired + private ISysPositionService positionService; + + @Autowired + private ICoreMemTreeService memTreeService; + + @Autowired + private SysRefUserPositionRepository refUserPositionRDao; + + /** + * 通过部门主键获取岗位树，-1为根节点 + * @return 处理结果 + */ + @GetMapping(value="/position/root") + @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点") + public ResultBean listSysPositionTree() { + try { + List list = positionService.listSysPosition(); + + return ResultBean.success("查询部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(memTreeService.packTreeSysPosition(list,CommonEnumUtil.PARENT.DEFAULT.getValue())); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value="/position/userId") + @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点") + public ResultBean listSysPositionParentId(Long userId) { + try { + List list = positionService.listSysPosition(); + List listTree = memTreeService.packTreeSysPosition(list, CommonEnumUtil.PARENT.DEFAULT.getValue()); + List refList = refUserPositionRDao.findByProperty("userId", userId); + + return ResultBean.success("查询部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(memTreeService.packTreeSysPositionBySysRefUserPosition(listTree,refList)); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value="/position/ids") + @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点") + public ResultBean listSysPositionParentId(Long[] ids) { + 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); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value="/position/id") + @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点") + public ResultBean listSysPositionById(Long id) { + try { + List list = positionService.listSysPosition(); + SysPosition position = memTreeService.packTreeSysPositionById(list,id); + + return ResultBean.success("查询部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(position); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value="/position/child") + @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点") + public ResultBean listSysPositionChild(Long id) { + try { + List list = positionService.listSysPosition(); + SysPosition position = memTreeService.packTreeSysPositionById(list,id); + + return ResultBean.success("查询部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(memTreeService.findChildSysPosition(position)); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + +} 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 new file mode 100644 index 0000000..73154a2 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreMemTreeService.java @@ -0,0 +1,102 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysPosition; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserPosition; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019-07-04 下午12:46 + * @Modify: + **/ +@Service +public class CoreMemTreeService implements ICoreMemTreeService { + + @Override + public List packTreeSysPosition(List list, Long parentId) { + List result = new ArrayList<>(); + List copyList = new ArrayList<>(list); + + if(list != null && list.size() > 0){ + list.forEach(position -> { + if(position.getParentId() != null && position.getParentId().equals(parentId)){ + result.add(position); + copyList.remove(position); + position.setChildList(packTreeSysPosition(copyList, position.getId())); + } + }); + } + + return result; + } + + @Override + public List packTreeSysPositionBySysRefUserPosition(List list, List refList) { + List ids = new ArrayList<>(refList.size()); + + if(refList != null && refList.size() > 0){ + refList.forEach(ref ->{ + ids.add(ref.getPositionId()); + }); + } + + return packTreeSysPositionByIds(list, ids); + } + + @Override + public List packTreeSysPositionByIds(List list, List ids) { + List result = new ArrayList<>(); + + if(list != null && list.size() > 0){ + list.forEach(position -> { + if(position.getChildList() == null || position.getChildList().size() <= 0){ + if(ids.contains(position.getId())){ + result.add(position); + } + }else{ + List childList = packTreeSysPositionByIds(position.getChildList(), ids); + if(ids.contains(position.getId()) || childList != null && childList.size() > 0){ + result.add(position); + } + } + }); + } + + return result; + } + + @Override + public SysPosition packTreeSysPositionById(List list, Long id) { + if(list != null && list.size() > 0){ + for (SysPosition position : list) { + if(position.getId().equals(id)){ + position.setChildList(packTreeSysPosition(list, position.getId())); + return position; + } + } + } + return null; + } + + @Override + public List findChildSysPosition(SysPosition position) { + List result = new ArrayList<>(); + + if(position != null && position.getChildList() != null && position.getChildList().size() > 0){ + for (SysPosition sp : position.getChildList()) { + result.add(sp.getId()); + result.addAll(findChildSysPosition(sp)); + } + } + + return result; + } +} 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 0c69557..6ddba5e 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -145,6 +146,13 @@ public class SysPositionService implements ISysPositionService { } @Override + public List findSysPositionByOrganizeCode(String organizeCode) { + LOGGER.info("岗位信息 SysPosition By OrganizeCode:{}",organizeCode); + + return null; + } + + @Override @ApiOperation(value = "查询岗位信息", notes = "查询岗位信息 (分页，组合)") public ListPager querySysPosition(SysPosition position, Pager pager) { LOGGER.info("岗位信息 SysPosition find SysPosition page"); @@ -156,9 +164,9 @@ public class SysPositionService implements ISysPositionService { return new ListPager(positionRDao.listPager(pager), pager); } else { //生成hql查询语句 - String hqlPack = CoreHqlPack.packHqlSysPosition(position); - pager = PagerHelper.getPager(pager, positionRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(positionRDao.findByHqlWherePage(hqlPack + position.orderBy(), pager), pager); + DdlPackBean ddlPackBean = CoreHqlPack.packHqlSysPosition(position); + pager = PagerHelper.getPager(pager, positionRDao.findByHqlWhereCount(ddlPackBean)); + return new ListPager(positionRDao.findByHqlWherePage(ddlPackBean, pager), pager); } } @@ -179,11 +187,13 @@ public class SysPositionService implements ISysPositionService { pager = PagerHelper.getPager(pager, positionRDao.listCount()); return new ListPager(positionRDao.listPager(pager), pager); } else { - String hqlPack = CoreHqlPack.packHqlSysPosition(position); - pager = PagerHelper.getPager(pager, positionRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(positionRDao.findByHqlWherePage(hqlPack + position.orderBy(), pager), pager); + DdlPackBean ddlPackBean = CoreHqlPack.packHqlSysPosition(position); + pager = PagerHelper.getPager(pager, positionRDao.findByHqlWhereCount(ddlPackBean)); + return new ListPager(positionRDao.findByHqlWherePage(ddlPackBean, pager), pager); } } + + }