From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 7773825..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;
}
/**
@@ -558,7 +570,18 @@
*/
@Override
public List<SysUser> userListNoPage(SysUser user) {
- 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