From 2a951bdaad7ccb2a22015052e476c6f177146e85 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Sat, 28 Mar 2026 15:50:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20[=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=20[=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86]=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxhq/system/api/domain/SysUser.java | 11 +++++++++++ .../com/hxhq/system/controller/SysUserController.java | 7 +++++-- .../java/com/hxhq/system/mapper/SysUserMapper.java | 7 +++++++ .../java/com/hxhq/system/service/ISysUserService.java | 7 +++++++ .../hxhq/system/service/impl/SysUserServiceImpl.java | 16 ++++++++++++++++ .../src/main/resources/mapper/system/SysUserMapper.xml | 18 ++++++++++++++---- 6 files changed, 60 insertions(+), 6 deletions(-) diff --git a/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysUser.java b/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysUser.java index e9bf000..419c0fc 100644 --- a/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysUser.java +++ b/hxhq-api/hxhq-api-system/src/main/java/com/hxhq/system/api/domain/SysUser.java @@ -98,6 +98,9 @@ public class SysUser extends BaseEntity /** 角色ID */ private Long roleId; + /** 角色名称 */ + private String roleNames; + public SysUser() { @@ -296,6 +299,14 @@ public class SysUser extends BaseEntity this.roleIds = roleIds; } + public String getRoleNames() { + return roleNames; + } + + public void setRoleNames(String roleNames) { + this.roleNames = roleNames; + } + public Long[] getPostIds() { return postIds; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java index d8318e0..0d5d6cb 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java @@ -107,7 +107,9 @@ public class SysUserController extends BaseController { startPage(); List list = userService.selectUserList(user); - return getDataTable(list); + TableDataInfo tableDataInfo = getDataTable(list); + tableDataInfo.setRows(userService.initRoleNames((List)tableDataInfo.getRows())); + return tableDataInfo; } @Log(title = "用户管理", businessType = BusinessType.EXPORT) @@ -116,6 +118,7 @@ public class SysUserController extends BaseController public void export(HttpServletResponse response, SysUser user) { List list = userService.selectUserList(user); + list = userService.initRoleNames(list); List userList = new ArrayList<>(); for(SysUser u : list){ UserExportDto exportDto = new UserExportDto(); @@ -123,7 +126,7 @@ public class SysUserController extends BaseController exportDto.setNickName(u.getNickName()); exportDto.setEmail(u.getEmail()); exportDto.setDeptName(u.getDept()==null?"":u.getDept().getDeptName()); - exportDto.setRoleName(getRoleName(u.getRoles())); + exportDto.setRoleName(u.getRoleNames()); exportDto.setStatus("0".endsWith(u.getStatus())?("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"启用":"Enabled"):("zh_CN".equals(ServletUtils.getRequest().getHeader("lang"))?"禁用":"Disabled")); userList.add(exportDto); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java index 805c614..6bb227a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/mapper/SysUserMapper.java @@ -23,6 +23,13 @@ public interface SysUserMapper public List selectUserList(SysUser sysUser); /** + * 获取用户的角色 + * @param userIdList + * @return + */ + public List selectUserRoleNames(@Param("userIdList") List userIdList); + + /** * 根据条件分页查询已配用户角色列表 * * @param user 用户信息 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java index 4e2304f..0b06972 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/ISysUserService.java @@ -24,6 +24,13 @@ public interface ISysUserService public List selectUserList(SysUser user); /** + * 赋值用户的角色 + * @param list + * @return + */ + public List initRoleNames(List list); + + /** * 根据条件分页查询已分配用户角色列表 * * @param user 用户信息 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java index 4901719..48a0a6f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysUserServiceImpl.java @@ -103,6 +103,22 @@ public class SysUserServiceImpl implements ISysUserService return userMapper.selectUserList(user); } + @Override + public List initRoleNames(List list) { + if(list!=null && list.size()>0){ + List roleNameList = userMapper.selectUserRoleNames(list.stream().map(o->o.getUserId()).collect(Collectors.toList())); + for(SysUser l : list){ + for(SysUser r: roleNameList){ + if(l.getUserId().equals(r.getUserId())){ + l.setRoleNames(r.getRemark()); + break; + } + } + } + } + return list; + } + /** * 根据条件分页查询已分配用户角色列表 * diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysUserMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysUserMapper.xml index fa5b895..8f10c4f 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -58,9 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +