|
@@ -136,16 +136,16 @@ public class SysUserController extends BaseController {
|
|
|
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
|
|
|
@PreAuthorize("@ss.hasPermi('system:user:export')")
|
|
|
@PostMapping("/export")
|
|
|
- public void export(HttpServletResponse response, SysUser user) {
|
|
|
+ public void export(HttpServletResponse response, SysUserVo sysUserVo) {
|
|
|
List<Long> longs = new ArrayList<>();
|
|
|
- List<SysUser> list = userService.selectUserList(user);
|
|
|
- for (SysUser sysUser : list) {
|
|
|
+ sysUserVo = (SysUserVo) dataScoreUtil.setDataScore(getUserId(), sysUserVo);
|
|
|
+ List<SysUser> usetList = userService.usetList(sysUserVo);
|
|
|
+ for (SysUser sysUser : usetList) {
|
|
|
StringBuilder stringBuilder = new StringBuilder();
|
|
|
if (SysUser.isAdmin(sysUser.getId())) {
|
|
|
List<SysRole> roles = roleService.selectRoleAll();
|
|
|
- for (SysRole role : roles) {
|
|
|
- longs.add(role.getRoleId());
|
|
|
- }
|
|
|
+ List<SysRole> roLe = roles.stream().filter(r -> r.getRoleName().equals("超级管理员")).collect(Collectors.toList());
|
|
|
+ longs.add(roLe.get(0).getRoleId());
|
|
|
} else {
|
|
|
longs = roleService.selectRoleListByUserId(sysUser.getId());
|
|
|
}
|
|
@@ -158,7 +158,7 @@ public class SysUserController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
|
|
- util.exportExcel(response, list, "用户数据");
|
|
|
+ util.exportExcel(response, usetList, "用户数据");
|
|
|
}
|
|
|
|
|
|
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
|