Commit 730c08a1 by dliangx

update

parent 499229c4
......@@ -325,8 +325,9 @@ func GetRelatedRoute(obj model.GeoJson) ([]model.OptRoute, error) {
return []model.OptRoute{}, err
}
defer rows.Close()
hasData := false
for rows.Next() {
hasData = true
var result model.OptRoute
var jsonb_data []byte
err = rows.Scan(&result.ID, &result.Type, &jsonb_data, &result.OptTime, &result.Geometry)
......@@ -338,7 +339,9 @@ func GetRelatedRoute(obj model.GeoJson) ([]model.OptRoute, error) {
}
results = append(results, result)
}
if !hasData {
return []model.OptRoute{}, errors.New("no data")
}
return results, err
}
......@@ -368,8 +371,9 @@ func GetRelatedOptArea(obj model.GeoJson) ([]model.OptArea, error) {
return []model.OptArea{}, err
}
defer rows.Close()
hasData := false
for rows.Next() {
hasData = true
var result model.OptArea
var jsonb_data []byte
err = rows.Scan(&result.ID, &result.Type, &result.Properties, &result.OptTime, &result.Geometry)
......@@ -381,6 +385,9 @@ func GetRelatedOptArea(obj model.GeoJson) ([]model.OptArea, error) {
}
results = append(results, result)
}
if !hasData {
return []model.OptArea{}, errors.New("no data")
}
return results, err
}
......@@ -409,11 +416,12 @@ func GetRelatedAdmArea(obj model.GeoJson) ([]model.GeoJson, error) {
return []model.GeoJson{}, err
}
defer rows.Close()
hasData := false
for rows.Next() {
hasData = true
var result model.GeoJson
var jsonb_data []byte
err = rows.Scan(&result.ID, &result.Type, &result.Properties, &result.Geometry)
err = rows.Scan(&result.ID, &result.Type, &jsonb_data, &result.Geometry)
if err != nil {
return []model.GeoJson{}, err
}
......@@ -422,6 +430,9 @@ func GetRelatedAdmArea(obj model.GeoJson) ([]model.GeoJson, error) {
}
results = append(results, result)
}
if !hasData {
return []model.GeoJson{}, errors.New("no data")
}
return results, err
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment