Merge branch 'aj_english_report' into debug

controllers/english_report/report.go

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