过滤自由布局研报

models/eta/eta_report.go

@@ -68,7 +68,7 @@ type ReportPermission struct {
 }
 
 func GetETAReports(id int) (reports []ETAReport, err error) {
-	err = models.ETA().Table("report").Select(colunms+strings.Join(classifyIds, ",")).Where("state =? or state=?", Published, Passed).Where("id > ?", id).Order("id asc").Limit(limit).Find(&reports).Error
+	err = models.ETA().Table("report").Select(colunms+strings.Join(classifyIds, ",")).Where("state =? or state=?", Published, Passed).Where("id > ?", id).Where("report_layout !=3").Order("id asc").Limit(limit).Find(&reports).Error
 	if reports != nil {
 		for i := 0; i < len(reports); i++ {
 			setClassifyIdValue(&reports[i])
@@ -81,7 +81,7 @@ func GetUpdateETAReports() (filterList []ETAReport, err error) {
 	duration := time.Now().Add(-30 * time.Second)
 	modifyTime := duration.Format(time.DateTime)
 	var reports []ETAReport
-	err = models.ETA().Table("report").Select(colunms+strings.Join(classifyIds, ",")).Where("modify_time >=?", modifyTime).Order("id asc").Find(&reports).Error
+	err = models.ETA().Table("report").Select(colunms+strings.Join(classifyIds, ",")).Where("report_layout !=3").Where("modify_time >=?", modifyTime).Order("id asc").Find(&reports).Error
 	if err != nil {
 		logger.Error("同步eta研报数据失败:%v", err)
 	}