ly
/
Stwzhj-Cloud-Plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 优化 兼容部分用户不想给用户分配角色与部门的场景

2.X
疯狂的狮子Li 2024-08-15 20:04:38 +08:00
parent 6dab38be78
commit f0d2dc6b16
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java
View File

@ -2,6 +2,7 @@ package org.dromara.system.dubbo;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
@ -40,6 +41,9 @@ public class RemoteDataScopeServiceImpl implements RemoteDataScopeService {
*/ */
@Override @Override
public String getRoleCustom(Long roleId) { public String getRoleCustom(Long roleId) {
if (ObjectUtil.isNull(roleId)) {
return "-1";
}
List<SysRoleDept> list = roleDeptMapper.selectList( List<SysRoleDept> list = roleDeptMapper.selectList(
new LambdaQueryWrapper<SysRoleDept>() new LambdaQueryWrapper<SysRoleDept>()
.select(SysRoleDept::getDeptId) .select(SysRoleDept::getDeptId)
@ -47,7 +51,7 @@ public class RemoteDataScopeServiceImpl implements RemoteDataScopeService {
if (CollUtil.isNotEmpty(list)) { if (CollUtil.isNotEmpty(list)) {
return StreamUtils.join(list, rd -> Convert.toStr(rd.getDeptId())); return StreamUtils.join(list, rd -> Convert.toStr(rd.getDeptId()));
} }
return null; return "-1";
} }
/** /**
@ -58,6 +62,9 @@ public class RemoteDataScopeServiceImpl implements RemoteDataScopeService {
*/ */
@Override @Override
public String getDeptAndChild(Long deptId) { public String getDeptAndChild(Long deptId) {
if (ObjectUtil.isNull(deptId)) {
return "-1";
}
List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>() List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
.select(SysDept::getDeptId) .select(SysDept::getDeptId)
.apply(DataBaseHelper.findInSet(deptId, "ancestors"))); .apply(DataBaseHelper.findInSet(deptId, "ancestors")));
@ -66,7 +73,7 @@ public class RemoteDataScopeServiceImpl implements RemoteDataScopeService {
if (CollUtil.isNotEmpty(ids)) { if (CollUtil.isNotEmpty(ids)) {
return StreamUtils.join(ids, Convert::toStr); return StreamUtils.join(ids, Convert::toStr);
} }
return null; return "-1";
} }
} }

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java
View File

@ -259,9 +259,11 @@ public class RemoteUserServiceImpl implements RemoteUserService {
loginUser.setUserType(userVo.getUserType()); loginUser.setUserType(userVo.getUserType());
loginUser.setMenuPermission(permissionService.getMenuPermission(userVo.getUserId())); loginUser.setMenuPermission(permissionService.getMenuPermission(userVo.getUserId()));
loginUser.setRolePermission(permissionService.getRolePermission(userVo.getUserId())); loginUser.setRolePermission(permissionService.getRolePermission(userVo.getUserId()));
if (ObjectUtil.isNotNull(userVo.getDeptId())) {
Opt<SysDeptVo> deptOpt = Opt.of(userVo.getDeptId()).map(deptService::selectDeptById); Opt<SysDeptVo> deptOpt = Opt.of(userVo.getDeptId()).map(deptService::selectDeptById);
loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY)); loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY));
loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY)); loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY));
}
List<SysRoleVo> roles = roleService.selectRolesByUserId(userVo.getUserId()); List<SysRoleVo> roles = roleService.selectRolesByUserId(userVo.getUserId());
loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class)); loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
return loginUser; return loginUser;