Merge branch 'develop' of gitadmin/tuoheng_oidc into release

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

@@ -599,6 +599,7 @@ public class TenantServiceImpl implements TenantService {
         //筛选出一样的则不做相关操作
         //删除租户原始权限
         deleteClientRoleDtoList = clientRoleDtos.stream().filter(t -> !finalClientRoleDtoList.contains(t)).collect(Collectors.toList());
+        deleteClientRoleDtoList = getClientRoleDtos(deleteClientRoleDtoList);
         clientRoleDtos = clientRoleDtos.stream().filter(t -> !list.contains(t)).collect(Collectors.toList());
         for (ClientRoleDto clientRoleDto : deleteClientRoleDtoList) {
             clientUserRoleMapper.deleteByUserIdAndClient(tenant.getUserId(), clientRoleDto.getClientId());