Merge branch 'develop' of gitadmin/tuoheng_oidc into release

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

@@ -583,6 +583,7 @@ public class TenantServiceImpl implements TenantService {
         }
 
         log.info("现有集合:{}", list.toString());
+        list.forEach(t->t.setServiceId(null));
         //现有集合
         List<ClientRoleDto> clientRoleDtos = getClientRoleDtos(list);
         //租户对应的业务平台相关信息
@@ -600,6 +601,7 @@ 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());