From 8c1476227a97bdf119f1139c3621009576be3d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 18 Sep 2020 15:56:13 +0800 Subject: [PATCH] =?UTF-8?q?fix(core):=E6=B2=A1=E6=9C=89=E6=8C=89=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E6=9D=A1=E4=BB=B6=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/SysUserInfoController.java | 75 ++++++++++++---------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index 2387495..da35a5f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -195,36 +195,7 @@ public class SysUserInfoController extends CoreBaseController{ @ApiOperation(value="查询用户信息",notes="复杂查询用户信息带分页") public ResultBean querySysUserInfo(SysUserInfo userInfo, Pager pager){ try{ - List idList = new ArrayList<>(); - if(userInfo.getOrganizeId() == null || userInfo.getOrganizeId() <= 0) { - if (AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { - userInfo.setOrganizeCode(null); - userInfo.setOrganizeId(null); - } else { - userInfo.setOrganizeId(AuthUtil.getOrganize().getId()); - userInfo.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - } - } - - List departmentIdList = memTreeService.findDepartmentIdListByOrganizeIdAndDepartmentId(userInfo.getOrganizeId(), userInfo.getDepartmentId()); - if(departmentIdList != null && departmentIdList.size() > 0){ - List refList = personnelService.findSysRefUserInfoDepartmentByDepartmentIdList(departmentIdList); - if(refList != null && refList.size() > 0){ - refList.forEach(ref -> idList.add(ref.getUserId())); - } - } - - if(userInfo.getPositionId() != null && userInfo.getPositionId() > 0){ - List refList = memTreeService.findSysPositionChildIdList(userInfo.getPositionId()); - if(refList != null && refList.size() > 0){ - List refUserPositionList = personnelService.findSysRefUserPositionByIdList(refList); - if(refUserPositionList != null && refUserPositionList.size() > 0){ - refUserPositionList.forEach(ref -> idList.add(ref.getUserId())); - } - } - } - - ListPager result = sysUserInfoService.querySysUserInfo(userInfo,idList, pager); + ListPager result = sysUserInfoService.querySysUserInfo(userInfo, packUserInfo(userInfo), pager); return ResultBean.success("操作成功").setListPager(result).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -406,10 +377,10 @@ public class SysUserInfoController extends CoreBaseController{ @GetMapping("/export") @ApiOperation(value = "导出用户信息",notes = "导出用户信息") - public void exportSysUserInfo(SysUserInfo sysUserInfo, HttpServletResponse response) throws Exception { + public void exportSysUserInfo(SysUserInfo userInfo, HttpServletResponse response) throws Exception { File file = null; try { - List list = sysUserInfoService.findSysUserInfoList(sysUserInfo); + List list = sysUserInfoService.querySysUserInfoList(userInfo, packUserInfo(userInfo)); Map sysUserMap = sysUserService.list().stream() .collect(Collectors.toMap(SysUser::getId, Function.identity())); List exportModelList = new ArrayList<>(); @@ -418,16 +389,16 @@ public class SysUserInfoController extends CoreBaseController{ UserExportModel userExportModel; List sysRefUserRoleList; StringBuilder roleName = new StringBuilder(); - for (SysUserInfo userInfo : list) { + for (SysUserInfo userInfoItem : list) { // 关联角色信息 - sysRefUserRoleList = sysUserService.findSysRefUserRoleByUserId(userInfo.getUserId()); + sysRefUserRoleList = sysUserService.findSysRefUserRoleByUserId(userInfoItem.getUserId()); for (SysRefUserRole sysRefUserRole : sysRefUserRoleList) { roleName.append(sysRefUserRole.getRoleNameRdd()).append(","); } roleName.setLength(roleName.length() - 1); // 封装model - userExportModel = new UserExportModel(sysUserMap.get(userInfo.getUserId()), userInfo); + userExportModel = new UserExportModel(sysUserMap.get(userInfoItem.getUserId()), userInfoItem); userExportModel.setRoleNameRdd(roleName.toString()); exportModelList.add(userExportModel); @@ -461,4 +432,38 @@ public class SysUserInfoController extends CoreBaseController{ } } + private ArrayList packUserInfo(SysUserInfo userInfo){ + ArrayList idList = new ArrayList<>(); + if (userInfo.getOrganizeId() == null || userInfo.getOrganizeId() <= 0) { + if (AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { + userInfo.setOrganizeCode(null); + userInfo.setOrganizeId(null); + } else { + userInfo.setOrganizeId(AuthUtil.getOrganize().getId()); + userInfo.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + } + } + + List departmentIdList = memTreeService.findDepartmentIdListByOrganizeIdAndDepartmentId( + userInfo.getOrganizeId(), userInfo.getDepartmentId() + ); + if (departmentIdList != null && departmentIdList.size() > 0) { + List refList = personnelService.findSysRefUserInfoDepartmentByDepartmentIdList(departmentIdList); + if (refList != null && refList.size() > 0) { + refList.forEach(ref -> idList.add(ref.getUserId())); + } + } + + if (userInfo.getPositionId() != null && userInfo.getPositionId() > 0) { + List refList = memTreeService.findSysPositionChildIdList(userInfo.getPositionId()); + if (refList != null && refList.size() > 0) { + List refUserPositionList = personnelService.findSysRefUserPositionByIdList(refList); + if (refUserPositionList != null && refUserPositionList.size() > 0) { + refUserPositionList.forEach(ref -> idList.add(ref.getUserId())); + } + } + } + return idList; + } + }