Merge branch 'develop' of gitadmin/tuoheng_oidc into release

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

@@ -600,7 +600,6 @@ public class TenantServiceImpl implements TenantService {
             if (ObjectUtil.isNotNull(tenantEmploy)) {
                 clientRoleDto.setServiceId(tenantEmploy.getServiceId());
             }
-            clientRoleDto.setServiceId(null);
             //此处  暂时格式都为 tuoheng-hhz-web 等格式  如后续维护需要变更形式则此处代码需要更改
             clientRoleDto.setRoleId(clientUserRolePo.getRoleId());
             clientRoleDto.setRoleName(clientUserRolePo.getRoleName());
@@ -608,7 +607,6 @@ public class TenantServiceImpl implements TenantService {
             clientRoleDtoList.add(clientRoleDto);
         }
         //原有集合
-        list.forEach(t->t.setServiceId(null));
         clientRoleDtoList = clientRoleDtoList.stream().distinct().collect(Collectors.toList());
         List<ClientRoleDto> deleteList = clientRoleDtoList;
         log.info("原有集合:{}", clientRoleDtoList.toString());