update 根据角色id和部门id获取用户列表数据 去除权限
This commit is contained in:
+1
-9
@@ -146,29 +146,21 @@ public class SysUserController {
|
|||||||
/**
|
/**
|
||||||
* 根据角色id和部门id获取用户列表数据
|
* 根据角色id和部门id获取用户列表数据
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("sys:user:list")
|
|
||||||
@RequestMapping(value = "/listRoleAndDepart", method = RequestMethod.GET)
|
@RequestMapping(value = "/listRoleAndDepart", method = RequestMethod.GET)
|
||||||
public Result<List<SysUserVo>> queryListByRoleAndDepart(SysUser user,HttpServletRequest req) {
|
public Result<List<SysUserVo>> queryListByRoleAndDepart(SysUser user,HttpServletRequest req) {
|
||||||
String roleId = req.getParameter("roleId");
|
String roleId = req.getParameter("roleId");
|
||||||
String departId = req.getParameter("departId");
|
String departId = req.getParameter("departId");
|
||||||
Page<SysUserVo> page = new Page<>(-1, -1);
|
Page<SysUserVo> page = new Page<>(-1, -1);
|
||||||
IPage<SysUserVo> pageList = sysUserService.queryPageListByRoleAndDepart(page, user, roleId, departId);
|
IPage<SysUserVo> pageList = sysUserService.queryPageListByRoleAndDepart(page, user, roleId, departId);
|
||||||
List<SysUserVo> userList = new ArrayList<>();
|
List<SysUserVo> userList = pageList.getRecords();
|
||||||
for (SysUserVo record : pageList.getRecords()) {
|
|
||||||
//处理邮箱和手机号的加密
|
|
||||||
UserUtil.decryptUser(record);
|
|
||||||
userList.add(record);
|
|
||||||
}
|
|
||||||
//批量查询用户的所属部门
|
//批量查询用户的所属部门
|
||||||
//step.1 先拿到全部的 useids
|
//step.1 先拿到全部的 useids
|
||||||
//step.2 通过 useids,一次性查询用户的所属部门名字
|
//step.2 通过 useids,一次性查询用户的所属部门名字
|
||||||
List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
|
List<String> userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList());
|
||||||
if (userIds != null && userIds.size() > 0) {
|
if (userIds != null && userIds.size() > 0) {
|
||||||
Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
|
Map<String, String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
|
||||||
Map<String, String> roleNames = sysUserService.getRoleNameByUserIds(userIds);
|
|
||||||
userList.forEach(item -> {
|
userList.forEach(item -> {
|
||||||
item.setOrgCodeTxt(useDepNames.get(item.getId()));
|
item.setOrgCodeTxt(useDepNames.get(item.getId()));
|
||||||
item.setRoleName(roleNames.get(item.getId()));
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return Result.OK(userList);
|
return Result.OK(userList);
|
||||||
|
|||||||
Reference in New Issue
Block a user