From 8e941a8eac3329725cdd59cfa2bf3482ccbf057a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 16:45:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 903f7ae..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
@@ -12,6 +12,7 @@
import com.ruoyi.project.system.mapper.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -74,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;
}
/**
@@ -455,7 +468,7 @@
/**
* 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
- *
+ *
* @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
* @return 缁撴灉
*/
@@ -472,6 +485,9 @@
userRoleMapper.deleteUserRole(userIds);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
userPostMapper.deleteUserPost(userIds);
+ // 鍒犻櫎鐢ㄦ埛涓庨儴闂ㄦ暟鎹�
+ sysUserDeptMapper.delete(new LambdaQueryWrapper<SysUserDept>()
+ .in(SysUserDept::getUserId, userIds));
return userMapper.deleteUserByIds(userIds);
}
@@ -554,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