未发布的报告不显示收藏

models/report/report.go

@@ -435,7 +435,7 @@ func FilterReportIds(ids []int) (total int64, reportIds []int, err error) {
 	`
 	err = db.Model(&Report{}).Select("id").
 		Where("id in ?", ids).
-		Where("classify_id not in (?) and source=?", gorm.Expr(etaSubQuery), SourceETA).Or("plate_name not in (?) and source=?", gorm.Expr(htSubQuery), SourceHT).
+		Where("(classify_id not in (?) and source=?) or (plate_name not in (?) and source=?)", gorm.Expr(etaSubQuery), SourceETA, gorm.Expr(htSubQuery), SourceHT).
 		Where("Status = ?", StatusPublish).
 		Scan(&reportIds).Error
 	if err != nil {