From 9ebc618a9260e5f1a7534cab7fe086223af854ff Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 5 Jul 2019 22:01:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=80=E5=B8=90=E5=8F=B7=E7=AE=A1=E7=90=86=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ICoreMemTreeService.java | 7 +++ .../core/api/iservice/busi/IPersonnelService.java | 11 ++++- .../core/api/iservice/busi/ISysUserService.java | 3 ++ .../controller/busi/PersonnelController.java | 4 +- .../controller/busi/SysDepartmentController.java | 55 +++++----------------- .../controller/busi/SysRoleController.java | 2 +- .../controller/busi/SysUserController.java | 38 ++++++++++++--- .../serviceimpl/busi/CoreMemTreeService.java | 50 +++++++++++++++++++- .../serviceimpl/busi/PersonnelServiceService.java | 32 ++++++++++--- .../serviceimpl/busi/SysUserService.java | 9 +++- 10 files changed, 148 insertions(+), 63 deletions(-) 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 index a0ab1e5..de00edf 100644 --- 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 @@ -107,8 +107,15 @@ public interface ICoreMemTreeService { @ApiOperation(value = "组织树转TreeModel",notes = "使用分装好的树转为TreeMode") List packTreeTreeModelSysDepartment(List list); + @ApiOperation(value = "组织树转TreeModel",notes = "使用分装好的树转为TreeMode") List packTreeTreeModel(List list, List departmentList); + @ApiOperation(value = "获取部门ID 集合",notes = "使用分装好的树转为TreeMode") + List findDepartmentIdListByOrganizeIdAndDepartmentIdAndUserId(Long organizeId, Long departmentId, Long userId); + + + List findDepartmentIdListByOrganizeIdAndDepartmentId(Long organizeId, Long departmentId); + /********************************************* End CommonTreeModel Tree *********************************************/ diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java index 32770ca..ca7fcef 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IPersonnelService.java @@ -97,7 +97,13 @@ public interface IPersonnelService { List findSysMenuByRefRoleMenu(List refList); @ApiOperation(value = "查询账号角色关系") - List findSysRefUserRoleById(Long userId); + List findSysRefUserRole(Long userId); + + @ApiOperation(value = "查询账号角色关系") + List findSysRefUserRole(Long roleId,String organizeCode); + + @ApiOperation(value = "查询账号角色关系") + List findSysRefUserRole(Long userId,Long roleId,String organizeCode); @ApiOperation(value = "角色权限关系",notes = "根据角色ID 查询权限") List findSysRefRoleMenuByRoleIds(List roleIdList); @@ -113,6 +119,8 @@ public interface IPersonnelService { List findSysRefUserDepartmentByOrganizeIdList(List organizeIdList); + List findSysRefUserDepartmentByDepartmentIdList(List departmentIdList); + @ApiOperation(value = "查询账号部门关系") List querySysRefUserDepartmentByUserDetailModel(UserDetailModel model); @@ -121,7 +129,6 @@ public interface IPersonnelService { List findSysRefUserInfoDepartmentByOrganizeIdList(List organizeIdList); - @ApiOperation(value = "查询用户部门关系") List findSysUserInfoDepartmentByInfoId(Long infoId); diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index 6ac2ea7..dd46321 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -146,6 +146,9 @@ public interface ISysUserService { @ApiOperation(value = "账号查询",notes = "查询账号信息-复杂查询") ListPager querySysUserByPager(SysUser user, Pager pager); + @ApiOperation(value = "账号查询",notes = "查询账号信息-复杂查询") + ListPager querySysUserByPager(SysUser user,List idList, Pager pager); + /** * 根据id 数据 * @param id 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 1f903b6..8e572fb 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 @@ -298,7 +298,7 @@ public class PersonnelController extends CoreBaseController { List refUserInfoDepartmentList = personnelService.findSysRefUserInfoDepartmentById(info.getId()); List refUserPositionList = personnelService.findSysRefUserPositionById(info.getId()); List refUserDepartmentList = personnelService.findSysRefUserDepartmentByUserId(user.getId()); - List refUserRoleList = personnelService.findSysRefUserRoleById(user.getId()); + List refUserRoleList = personnelService.findSysRefUserRole(user.getId()); SysFile image = info.getUserImageId() != null ? fileService.getSysFileById(info.getUserImageId()) : null; resultMap.put("user", user); @@ -332,7 +332,7 @@ public class PersonnelController extends CoreBaseController { SysUser user = personnelService.getSysUserById(Long.parseLong(id)); List refUserInfoDepartmentList = personnelService.findSysRefUserDepartmentByUserId(user.getId()); - List refUserRoleList = personnelService.findSysRefUserRoleById(user.getId()); + List refUserRoleList = personnelService.findSysRefUserRole(user.getId()); resultMap.put("refUserDepartmentList", refUserInfoDepartmentList); resultMap.put("refUserRoleList", refUserRoleList); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index a590924..1529577 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -4,14 +4,11 @@ import cn.estsh.i3plus.core.api.iservice.busi.*; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; -import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; -import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -21,14 +18,11 @@ import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** @@ -179,46 +173,19 @@ public class SysDepartmentController extends CoreBaseController { @ApiOperation(value = "查询部门", notes = "组合查询部门信息外加分页信息") public ResultBean querySysDepartment(SysDepartment department, Pager pager) { try { - ListPager result = null; - List refIds = new ArrayList<>(); - List refFilterIds = new ArrayList<>(); - - // 通过组织获取部门信息 - if (department.getOrganizeId() != null && department.getOrganizeId() > 0) { - List organizeIdList = memTreeService.findSysOrganizeChildIdList(department.getOrganizeId()); - List refUserDepartmentList = personnelService.findSysRefUserDepartmentByOrganizeIdList(organizeIdList); - if (refUserDepartmentList != null && refUserDepartmentList.size() > 0) { - for (SysRefUserDepartment ref : refUserDepartmentList) { - refIds.add(ref.getDepartmentId()); - } - } - } - - // 通过父节点查询部门信息 - if (department.getParentId() != null && department.getParentId() > 0) { - List departmentIdList = memTreeService.findSysDepartmentChildIdList(department.getParentId()); - if (departmentIdList != null && departmentIdList.size() > 0) { - refIds.addAll(departmentIdList); - } - } - - // 用户所拥有的权限 - if (!AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { - List refList = personnelService.findSysRefUserDepartmentByUserId(getSessionUser().getUser().getId()); - if (refList != null && refList.size() > 0) { - refList.forEach(ref -> refFilterIds.add(ref.getDepartmentId())); - } - - if(refIds.size() <= 0){ - refIds = refFilterIds; - }else { - // List 取交集 - refIds = (ArrayList) CollectionUtils.intersection(refIds, refFilterIds); - } + List refIdList = null; + if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){ + refIdList = memTreeService.findDepartmentIdListByOrganizeIdAndDepartmentId(department.getOrganizeId(), department.getParentId()); + }else { + refIdList = memTreeService.findDepartmentIdListByOrganizeIdAndDepartmentIdAndUserId( + department.getOrganizeId(), + department.getParentId(), + getSessionUser().getUser().getId()); } - result = departmentService.findSysDepartmentPagerByIdList(department, new ArrayList<>(refIds), pager); - return ResultBean.success("操作成功").setListPager(result).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功") + .setListPager(departmentService.findSysDepartmentPagerByIdList(department, refIdList, pager)) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index e6b5097..28a2c08 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -219,7 +219,7 @@ public class SysRoleController extends CoreBaseController{ if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){ result = sysRoleService.querySysRole(role,pager); }else { - List refList = personnelService.findSysRefUserRoleById(getSessionUser().getUser().getId()); + List refList = personnelService.findSysRefUserRole(getSessionUser().getUser().getId()); if(refList != null && refList.size() > 0){ List idList = new ArrayList<>(refList.size()); refList.forEach(ref -> idList.add(ref.getRoleId())); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index e56f60e..c7b2778 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; -import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; -import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; -import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService; -import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; +import cn.estsh.i3plus.core.api.iservice.busi.*; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.EncryptTool; import cn.estsh.i3plus.platform.common.tool.StringTool; @@ -31,6 +28,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; /** @@ -59,6 +57,9 @@ public class SysUserController extends CoreBaseController{ @Autowired private IPersonnelService personnelService; + @Autowired + private ICoreMemTreeService coreMemTreeService; + /** * 新增系统用户 * @param sysUser 用户 @@ -297,8 +298,33 @@ public class SysUserController extends CoreBaseController{ @ApiOperation(value="查询系统用户",notes="组合查询用户，外带分页查询(isValid = 1)") public ResultBean querySysUserByPager(SysUser user, Pager pager){ try{ -// user.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - ListPager listPager = sysUserService.querySysUserByPager(user, pager); + List idList = new ArrayList<>(); + if(user.getOrganizeId() == null || user.getOrganizeId() <= 0) { + if (AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { + user.setOrganizeCode(null); + user.setOrganizeId(null); + } else { + user.setOrganizeId(AuthUtil.getOrganize().getId()); + user.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + } + } + + if(user.getRoleId() != null){ + List refUserRoleList = personnelService.findSysRefUserRole(user.getRoleId(), null); + if(refUserRoleList != null && refUserRoleList.size() > 0){ + refUserRoleList.forEach(ref -> idList.add(ref.getUserId())); + } + } + + List departmentIdList = coreMemTreeService.findDepartmentIdListByOrganizeIdAndDepartmentId(user.getOrganizeId(), user.getDepartmentId()); + if(departmentIdList != null && departmentIdList.size() > 0){ + List refList = personnelService.findSysRefUserDepartmentByDepartmentIdList(departmentIdList); + if(refList != null && refList.size() > 0){ + refList.forEach(ref -> idList.add(ref.getUserId())); + } + } + + ListPager listPager = sysUserService.querySysUserByPager(user,idList, pager); return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); 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 index ecbe064..fb7c79d 100644 --- 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 @@ -6,11 +6,13 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ModelEnumUtil; import cn.estsh.i3plus.pojo.model.platform.CommonTreeModel; import cn.estsh.i3plus.pojo.platform.bean.*; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * @Description : @@ -370,6 +372,52 @@ public class CoreMemTreeService implements ICoreMemTreeService { return list; } + @Override + public List findDepartmentIdListByOrganizeIdAndDepartmentIdAndUserId(Long organizeId, Long departmentId, Long userId) { + List refFilterIds = new ArrayList<>(); + List refIdList = findDepartmentIdListByOrganizeIdAndDepartmentId(organizeId, departmentId); + + // 用户所拥有的权限 + List refList = personnelService.findSysRefUserDepartmentByUserId(userId); + if (refList != null && refList.size() > 0) { + refList.forEach(ref -> refFilterIds.add(ref.getDepartmentId())); + } + + if(refIdList.size() <= 0){ + refIdList = refFilterIds; + }else { + // List 取交集 + refIdList = (ArrayList) CollectionUtils.intersection(refIdList, refFilterIds); + } + return refIdList.stream().distinct().collect(Collectors.toList()); + } + + @Override + public List findDepartmentIdListByOrganizeIdAndDepartmentId(Long organizeId, Long departmentId) { + List refIdList = new ArrayList<>(); + + // 通过组织获取部门信息 + if (organizeId != null && organizeId > 0) { + List organizeIdList = findSysOrganizeChildIdList(organizeId); + List refUserDepartmentList = personnelService.findSysRefUserDepartmentByOrganizeIdList(organizeIdList); + if (refUserDepartmentList != null && refUserDepartmentList.size() > 0) { + for (SysRefUserDepartment ref : refUserDepartmentList) { + refIdList.add(ref.getDepartmentId()); + } + } + } + + // 通过父节点查询部门信息 + if (departmentId != null && departmentId > 0) { + List departmentIdList = findSysDepartmentChildIdList(departmentId); + if (departmentIdList != null && departmentIdList.size() > 0) { + refIdList.addAll(departmentIdList); + } + } + + return refIdList.stream().distinct().collect(Collectors.toList()); + } + /********************************************* Start CommonTreeModel Tree *********************************************/ /********************************************* Start SysDepartment Tree *********************************************/ @@ -562,7 +610,7 @@ public class CoreMemTreeService implements ICoreMemTreeService { @Override public List packTreeSysMenuByUserId(Long userId) { - List roleList = personnelService.findSysRefUserRoleById(userId); + List roleList = personnelService.findSysRefUserRole(userId); if(roleList != null && roleList.size() > 0){ List refRoleMenuList = personnelService.findSysRefRoleMenuByRefUserRole(roleList); if(refRoleMenuList != null && refRoleMenuList.size() > 0){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index 146ba41..42d4a87 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -226,7 +226,7 @@ public class PersonnelServiceService implements IPersonnelService { public List findSysRoleByUserId(Long userId) { LOGGER.debug("平台账号角色 SysRole userId:{}", userId); - List refList = findSysRefUserRoleById(userId); + List refList = findSysRefUserRole(userId); if(refList != null && refList.size() > 0){ List idList = new ArrayList<>(); StringBuffer findWhere = new StringBuffer(); @@ -267,7 +267,7 @@ public class PersonnelServiceService implements IPersonnelService { @Override public List findSysMenuByUserId(Long userId) { LOGGER.info("平台账号权限 SysMenu userId:{}",userId); - List refUserRoleList = findSysRefUserRoleById(userId); + List refUserRoleList = findSysRefUserRole(userId); List refRoleMenuList = findSysRefRoleMenuByRefUserRole(refUserRoleList); return findSysMenuByRefRoleMenu(refRoleMenuList); } @@ -298,9 +298,19 @@ public class PersonnelServiceService implements IPersonnelService { } @Override - public List findSysRefUserRoleById(Long userId) { - LOGGER.info("平台账号角色 SysRefUserRole userId:{}", userId); - return refUserRoleRDao.findByProperty("userId",userId); + public List findSysRefUserRole(Long userId) { + return findSysRefUserRole(userId, null, null); + } + + @Override + public List findSysRefUserRole(Long roleId, String organizeCode) { + return findSysRefUserRole(null, roleId, organizeCode); + } + + @Override + public List findSysRefUserRole(Long userId, Long roleId, String organizeCode) { + LOGGER.info("平台账号角色 SysRefUserRole userId:{} roleId:{} organizeCode:{}",userId, roleId,organizeCode); + return refUserRoleRDao.findByHqlWhere(CoreHqlPack.packDdlBeanSysRefUserRole(userId, roleId, organizeCode)); } @Override @@ -308,7 +318,7 @@ public class PersonnelServiceService implements IPersonnelService { LOGGER.info("平台账号角色 SysRefRoleMenu roleIdList:{}", roleIdList); if(roleIdList != null){ StringBuffer findWhere = new StringBuffer(); - HqlPack.getInPack(StringUtils.join(roleIdList,","),"id",findWhere); + HqlPack.getInPack(StringUtils.join(roleIdList,","),"roleId",findWhere); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",findWhere); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",findWhere); @@ -356,6 +366,16 @@ public class PersonnelServiceService implements IPersonnelService { } @Override + public List findSysRefUserDepartmentByDepartmentIdList(List departmentIdList) { + LOGGER.info("平台账号部门 SysRefUserDepartment departmentIdList:{}", departmentIdList); + + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getInPackList(departmentIdList,"departmentId",packBean); + + return refUserDepartmentRDao.findByHqlWhere(packBean); + } + + @Override public List querySysRefUserDepartmentByUserDetailModel(UserDetailModel model) { if(model != null){ StringBuffer userIdWhere = new StringBuffer(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index e4668ea..2496f89 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -372,7 +372,7 @@ public class SysUserService implements ISysUserService { // 角色查询 if(user.getRoleId() != null){ - List ids = findSysUserIdListByRoleId(Long.parseLong(user.getRoleId())); + List ids = findSysUserIdListByRoleId(user.getRoleId()); user.setRoleIdList(StringTool.getListString(ids)); } @@ -408,6 +408,13 @@ public class SysUserService implements ISysUserService { } @Override + public ListPager querySysUserByPager(SysUser user, List idList, Pager pager) { + DdlPackBean packBean = CoreHqlPack.packDdlBeanSysUser(user, idList); + pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(packBean)); + return new ListPager(sysUserRDao.findByHqlWherePage(packBean, pager), pager); + } + + @Override @ApiOperation(value = "账号查询", notes = "根据ID 查询账号信息") public SysUser getSysUserById(Long id) { LOGGER.debug("平台用户 SYS_USER get By id :{}", id);