From b22df417e0bc423c788b013feaad686531d69eed Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 08 一月 2025 09:51:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 291ae90..9bde5e4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -455,12 +455,6 @@
for (SysUser user : sysUsers) {
if(2 == user.getRoleType()){
userShopService.remove(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId()).eq(UserShop::getShopId, user.getObjectId()));
- UserShop userShop = new UserShop();
- userShop.setUserId(user.getUserId());
- userShop.setShopId(user.getObjectId());
- userShop.setRoleType(2);
- userShop.setRoleId(user.getRoleId());
- userShopService.save(userShop);
}
}
return i;
@@ -533,20 +527,31 @@
}
List<SysUser> list = this.baseMapper.getList(pageInfo, getSysUserList);
for (SysUser sysUser : list) {
- List<SysUserRole> list1 = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId()));
- List<String> roleNames = new ArrayList<>();
- for (SysUserRole sysUserRole : list1) {
- SysRole sysRole = sysRoleService.selectRoleById(sysUserRole.getRoleId());
- if(null == sysRole){
- continue;
+ if(sysUser.getRoleType() == 2){
+ UserShop userShop = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getShopId, sysUser1.getObjectId()).eq(UserShop::getUserId, sysUser.getUserId()));
+ SysRole sysRole = roleMapper.selectRoleById(userShop.getRoleId());
+ Long[] roleIds = new Long[]{userShop.getRoleId()};
+ sysUser.setNickName(userShop.getNickName());
+ sysUser.setRoleIds(roleIds);
+ sysUser.setRoleNames(Arrays.asList(sysRole.getRoleName()));
+ SysDept sysDept = deptService.selectDeptById(userShop.getDeptId());
+ sysUser.setDept(sysDept);
+ }else{
+ List<SysUserRole> list1 = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId()));
+ List<String> roleNames = new ArrayList<>();
+ for (SysUserRole sysUserRole : list1) {
+ SysRole sysRole = sysRoleService.selectRoleById(sysUserRole.getRoleId());
+ if(null == sysRole){
+ continue;
+ }
+ roleNames.add(sysRole.getRoleName());
}
- roleNames.add(sysRole.getRoleName());
+ Long[] roleIds = new Long[]{};
+ sysUser.setRoleIds(list1.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()).toArray(roleIds));
+ sysUser.setRoleNames(roleNames);
+ SysDept sysDept = deptService.selectDeptById(sysUser.getDeptId());
+ sysUser.setDept(sysDept);
}
- Long[] roleIds = new Long[]{};
- sysUser.setRoleIds(list1.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()).toArray(roleIds));
- sysUser.setRoleNames(roleNames);
- SysDept sysDept = deptService.selectDeptById(sysUser.getDeptId());
- sysUser.setDept(sysDept);
}
return pageInfo.setRecords(list);
}
--
Gitblit v1.7.1