From 01c12130c252155f22a1f8b1764e1049aaa97646 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 21 五月 2026 18:01:09 +0800
Subject: [PATCH] feat: /system/user/userListNoPage 返回角色ID集合
---
src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
index 9fc7b47..062c117 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -75,7 +75,19 @@
@DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectUserList(SysUser user)
{
- return userMapper.selectUserList(user);
+ List<SysUser> userList = userMapper.selectUserList(user);
+ // 灏嗚鑹睮D瀛楃涓茶浆鎹负鏁扮粍
+ userList.forEach(u -> {
+ if (u.getRoleIdsStr() != null && !u.getRoleIdsStr().isEmpty()) {
+ String[] strIds = u.getRoleIdsStr().split(",");
+ Long[] roleIds = new Long[strIds.length];
+ for (int i = 0; i < strIds.length; i++) {
+ roleIds[i] = Long.parseLong(strIds[i]);
+ }
+ u.setRoleIds(roleIds);
+ }
+ });
+ return userList;
}
/**
@@ -456,7 +468,7 @@
/**
* 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
- *
+ *
* @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
* @return 缁撴灉
*/
@@ -473,6 +485,9 @@
userRoleMapper.deleteUserRole(userIds);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
userPostMapper.deleteUserPost(userIds);
+ // 鍒犻櫎鐢ㄦ埛涓庨儴闂ㄦ暟鎹�
+ sysUserDeptMapper.delete(new LambdaQueryWrapper<SysUserDept>()
+ .in(SysUserDept::getUserId, userIds));
return userMapper.deleteUserByIds(userIds);
}
@@ -555,10 +570,18 @@
*/
@Override
public List<SysUser> userListNoPage(SysUser user) {
- //鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
- SysUser loginUser = SecurityUtils.getLoginUser().getUser();
- user.setTenantId(loginUser.getTenantId());
- return userMapper.selectUserList(user);
+ List<SysUser> userList = userMapper.selectUserList(user);
+ userList.forEach(u -> {
+ if (u.getRoleIdsStr() != null && !u.getRoleIdsStr().isEmpty()) {
+ String[] strIds = u.getRoleIdsStr().split(",");
+ Long[] roleIds = new Long[strIds.length];
+ for (int i = 0; i < strIds.length; i++) {
+ roleIds[i] = Long.parseLong(strIds[i]);
+ }
+ u.setRoleIds(roleIds);
+ }
+ });
+ return userList;
}
/**
--
Gitblit v1.9.3