models/report_chapter.go

@@ -609,7 +609,7 @@ func GetCountReportChapterByCondition(condition string, pars []interface{}) (cou
 // GetNewestPreReportChapterByClassifyIdAndTypeId 获取分类下往期中最新发布的系统章节
 func GetNewestPreReportChapterByClassifyIdAndTypeId(classifyId, typeId int) (item *ReportChapter, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM report_chapter WHERE classify_id_first = ? AND type_id = ? AND publish_state = 2 ORDER BY publish_time DESC LIMIT 1`
+	sql := `SELECT a.* FROM report_chapter AS a JOIN report AS b ON a.report_id = b.id WHERE a.classify_id_first = ? AND a.type_id = ? AND a.publish_state = 2 AND b.state IN (2,6) ORDER BY a.publish_time DESC LIMIT 1`
 	err = o.Raw(sql, classifyId, typeId).QueryRow(&item)
 	return
 }