Merge branch 'develop' of gitadmin/tuoheng_oidc into release

tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/TenantServiceImpl.java

@@ -582,9 +582,9 @@ public class TenantServiceImpl implements TenantService {
         //现有对比  拿出不需要的数据进行删除
         List<ClientRoleDto> deleteClientRoleDtoList;
         List<ClientRoleDto> insertClientRoleDtoList;
-        deleteClientRoleDtoList = list.stream().filter(t -> !deleteList.contains(t)).collect(Collectors.toList());
+        deleteClientRoleDtoList = clientRoleDtoList.stream().filter(t -> !list.contains(t)).collect(Collectors.toList());
         //新增
-        insertClientRoleDtoList = clientRoleDtoList.stream().filter(t -> !list.contains(t)).collect(Collectors.toList());
+        insertClientRoleDtoList = list.stream().filter(t -> !deleteClientRoleDtoList.contains(t)).collect(Collectors.toList());
         clientTenantDto.setClientRoleDtoList(deleteClientRoleDtoList);
         //符合先删后增逻辑 则直接将原有租户已经对应的关联业务数据清除
         JsonResult jsonResult = deleteTenant(clientTenantDto, loginUser);