fix

controllers/english_report/report.go

@@ -465,7 +465,7 @@ func (this *EnglishReportController) ListReport() {
 	{
 		// 未群发邮件(包含推送邮件失败的)
 		if emailState == 1 {
-			condition += ` AND email_state = 0 AND email_has_fail = 1`
+			condition += ` AND email_state = 0 OR email_has_fail = 1`
 		}
 		// 已群发邮件
 		if emailState == 2 {

models/english_report.go

@@ -317,7 +317,7 @@ func GetEnglishReportList(condition string, pars []interface{}, companyType stri
 		sql += condition
 	}
 	// 排序：1:未发布；2:已发布；3-待提交；4-待审批；5-已驳回；6-已通过
-	sql += `ORDER BY FIELD(state,3,1,4,5,6,2), modify_time DESC LIMIT ?,?`
+	sql += ` ORDER BY FIELD(state,3,1,4,5,6,2), modify_time DESC LIMIT ?,?`
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }