fix(DEFECT-403): 租户编辑或删除影响同角色租户管理员问题修复

@@ -198,44 +198,37 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan
 
 
     /**
     /**
      * 刷新租户管理员与角色关系
      * 刷新租户管理员与角色关系
+     * 1、1个租户1个角色；1个角色多个租户
+     * 2、1个角色多个用户(租户管理员)
      *
      *
      * @param tenantIds 租户ID
      * @param tenantIds 租户ID
      * @param newRoles  新增的角色ID
      * @param newRoles  新增的角色ID
      */
      */
     private void freshTenantAdminRole(Set<String> tenantIds, List<String> newRoles) {
     private void freshTenantAdminRole(Set<String> tenantIds, List<String> newRoles) {
-        AtomicBoolean notChanged = new AtomicBoolean(false);
         LambdaQueryWrapper<TenantRole> roleFilter = new QueryWrapper<TenantRole>().lambda()
         LambdaQueryWrapper<TenantRole> roleFilter = new QueryWrapper<TenantRole>().lambda()
                 .in(TenantRole::getTenantId, tenantIds);
                 .in(TenantRole::getTenantId, tenantIds);
-        List<String> oldRoleIds = tenantRoleMapper.selectList(roleFilter).stream()
+        List<String> deleteIds = tenantRoleMapper.selectList(roleFilter).stream()
                 .map(i -> i.getRoleId())
                 .map(i -> i.getRoleId())
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
-        List<String> deleteIds = oldRoleIds.stream()
-                .filter(f -> {
-                    if(newRoles == null || newRoles.isEmpty()){
-                        return true;
-                    }
-                    if(newRoles.contains(f)){
-                        notChanged.set(true);
-                        return false;
-                    }
-                    return true;
-                })
-                .collect(Collectors.toList());
-        if(!deleteIds.isEmpty()){
-            LambdaQueryWrapper<UserRole> filter = new QueryWrapper<UserRole>().lambda()
-                    .in(UserRole::getRoleId, deleteIds);
-            userRoleMapper.delete(filter);
-        }
 
 
-        if (notChanged.get() || newRoles == null || newRoles.isEmpty()) {
-            return;
-        }
         LambdaQueryWrapper<User> userFilter = new QueryWrapper<User>().lambda()
         LambdaQueryWrapper<User> userFilter = new QueryWrapper<User>().lambda()
                 .eq(User::getLevel,2)
                 .eq(User::getLevel,2)
                 .in(User::getTenantId, tenantIds);
                 .in(User::getTenantId, tenantIds);
         List<String> userIds = userMapper.selectList(userFilter).stream()
         List<String> userIds = userMapper.selectList(userFilter).stream()
                 .map(m -> m.getId())
                 .map(m -> m.getId())
                 .collect(Collectors.toList());
                 .collect(Collectors.toList());
+
+        if(!deleteIds.isEmpty() && !userIds.isEmpty()){
+            LambdaQueryWrapper<UserRole> filter = new QueryWrapper<UserRole>().lambda()
+                    .in(UserRole::getRoleId, deleteIds)
+                    .in(UserRole::getUserId,userIds);
+            userRoleMapper.delete(filter);
+        }
+
+        if (newRoles == null || newRoles.isEmpty()
+                || userIds == null || userIds.isEmpty()) {
+            return;
+        }
         userIds.forEach(item -> {
         userIds.forEach(item -> {
             for (String roleId : newRoles) {
             for (String roleId : newRoles) {
                 UserRole role = new UserRole();
                 UserRole role = new UserRole();