|
|
@@ -234,11 +234,10 @@ func GetPredictEdbInfoAllCalculate(edbInfoIdList []int) (list []*EdbInfo, err er
|
|
|
// ORDER BY a.source_edb_info_id ASC `
|
|
|
//_, err = o.Raw(sql, edbInfoIdList).QueryRows(&list)
|
|
|
|
|
|
- sql := ` SELECT b.* FROM predict_edb_conf AS a
|
|
|
+ sql := ` SELECT DISTINCT b.* FROM predict_edb_conf AS a
|
|
|
INNER JOIN edb_info AS b ON a.source_edb_info_id=b.edb_info_id
|
|
|
WHERE a.predict_edb_info_id in (` + utils.GetOrmInReplace(num) + `)
|
|
|
- GROUP BY a.source_edb_info_id
|
|
|
- ORDER BY a.source_edb_info_id ASC `
|
|
|
+ ORDER BY b.edb_info_id ASC `
|
|
|
err = global.DmSQL["data"].Raw(sql, edbInfoIdList).Find(&list).Error
|
|
|
return
|
|
|
}
|
