|
@@ -538,10 +538,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
sysUserRoleQueryWrapper.lambda().eq(SysUserRole::getUserId, sysUser.getId());
|
|
sysUserRoleQueryWrapper.lambda().eq(SysUserRole::getUserId, sysUser.getId());
|
|
sysUserRoleService.remove(sysUserRoleQueryWrapper);
|
|
sysUserRoleService.remove(sysUserRoleQueryWrapper);
|
|
|
|
|
|
- QueryWrapper<SysRoleGroupMember> sysRoleGroupMemberQueryWrapper = new QueryWrapper<>();
|
|
|
|
- sysRoleGroupMemberQueryWrapper.lambda().eq(SysRoleGroupMember::getUserId, sysUser.getId())
|
|
|
|
- .in(SysRoleGroupMember::getRoleId, removeRoleIds);
|
|
|
|
- sysRoleGroupMemberService.remove(sysRoleGroupMemberQueryWrapper);
|
|
|
|
|
|
+ if (Objects.nonNull(removeRoleIds) && removeRoleIds.size() > 0) {
|
|
|
|
+ QueryWrapper<SysRoleGroupMember> sysRoleGroupMemberQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ sysRoleGroupMemberQueryWrapper.lambda().eq(SysRoleGroupMember::getUserId, sysUser.getId())
|
|
|
|
+ .in(SysRoleGroupMember::getRoleId, removeRoleIds);
|
|
|
|
+ sysRoleGroupMemberService.remove(sysRoleGroupMemberQueryWrapper);
|
|
|
|
+ }
|
|
|
|
|
|
commonCacheService.removeUserRolePrivilegeCache(sysUser.getId());
|
|
commonCacheService.removeUserRolePrivilegeCache(sysUser.getId());
|
|
commonService.addUserRolePrivilege(sysUser, userSaveParams.getRoleIds());
|
|
commonService.addUserRolePrivilege(sysUser, userSaveParams.getRoleIds());
|