fix: 租户管理员数据更新问题修复

1、组织异常问题。
2、用户角色问题

@@ -312,8 +312,10 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     baseMapper.updateById(user);
     baseMapper.updateById(user);
     if (null != userDTO.getRoleIds()) {
     if (null != userDTO.getRoleIds()) {
       deleteAndAddUserRole(user.getId(), userDTO.getRoleIds());
       deleteAndAddUserRole(user.getId(), userDTO.getRoleIds());
+    }
+    if (null != userDTO.getOrganizationIds()) {
       userOrganizationMappingService.addOrUpdateUserOrganizationMapping(
       userOrganizationMappingService.addOrUpdateUserOrganizationMapping(
-          user.getId(), Arrays.asList(userDTO.getOrganizationIds()), true);
+              user.getId(), Arrays.asList(userDTO.getOrganizationIds()), true);
     }
     }
     user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
     user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
     return userDTO;
     return userDTO;
@@ -449,11 +451,8 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     }
     }
     baseMapper.insert(user);
     baseMapper.insert(user);
     List<SysTenantRoleEntity> tenantRoleList = validateTenantRole(userDTO.getTenantId());
     List<SysTenantRoleEntity> tenantRoleList = validateTenantRole(userDTO.getTenantId());
-    for (SysTenantRoleEntity tenantRole : tenantRoleList) {
-      String roleId = tenantRole.getRoleId();
-      if(userDTO.getRoleIds().contains(roleId)){
-        roleMapper.saveUserRoleMapping(user.getId(), roleId);
-      }
+    for (String roleId : userDTO.getRoleIds()) {
+      roleMapper.saveUserRoleMapping(user.getId(), roleId);
     }
     }
     user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
     user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
     return userDTO;
     return userDTO;