diff --git a/NOTICE b/NOTICE index a39b5344610..56815530eb2 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache DevLake (incubating) -Copyright 2022-2024 The Apache Software Foundation +Copyright 2022-2025 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). diff --git a/backend/helpers/srvhelper/scope_config_service_helper.go b/backend/helpers/srvhelper/scope_config_service_helper.go index 6c7e3e05f0e..7a93492a620 100644 --- a/backend/helpers/srvhelper/scope_config_service_helper.go +++ b/backend/helpers/srvhelper/scope_config_service_helper.go @@ -82,7 +82,7 @@ func (scopeConfigSrv *ScopeConfigSrvHelper[C, S, SC]) GetProjectsByScopeConfig(p dal.Select(fmt.Sprintf("bp.id AS blueprint_id, bp.project_name, bps.scope_id, %s.*", scopeTable)), dal.From("_devlake_blueprint_scopes bps"), dal.Join("LEFT JOIN _devlake_blueprints bp ON (bp.id = bps.blueprint_id)"), - dal.Join(fmt.Sprintf("LEFT JOIN %s ON (%s.connection_id = bps.connection_id AND %s = bps.scope_id)", scopeTable, scopeTable, theOtherPk)), + dal.Join(fmt.Sprintf("LEFT JOIN %s ON (%s.connection_id = bps.connection_id AND cast(%s as varchar) = bps.scope_id)", scopeTable, scopeTable, theOtherPk)), dal.Where("bps.plugin_name = ? AND bps.connection_id = ?", pluginName, (*scopeConfig).ScopeConfigConnectionId()), )) projectScopeMap := make(map[string]*models.ProjectScope)