no message

models/ficc_report/report.go

@@ -139,17 +139,10 @@ func GetFiccRreportToCygxArticle(condition string, pars []interface{}) (items []
 	sql := ` SELECT	* FROM report WHERE state = 2 AND  is_public_publish = 1 
 			AND classify_name_first IN ('宏观报告','晨会纪要','调研纪要','数据点评')
 			AND classify_name_second IN ('大类资产周报','晨会纪要','黑色调研','宏观G2观察','人民币汇率双周报','房地产市场跟踪','黄金月报','铜行业数据点评','原油基本面推演','原油船期数据跟踪','EIA原油库存点评')
-			AND IF ( classify_name_first = '宏观报告' , classify_name_second = '大类资产周报' ,1=1 )
+			AND IF ( classify_name_first = '宏观报告' , classify_name_second IN  ('大类资产周报','宏观G2观察''人民币汇率双周报''房地产市场跟踪''黄金月报')  ,1=1 )
 			AND IF ( classify_name_first = '晨会纪要' , classify_name_second = '晨会纪要' ,1=1 )
 			AND IF ( classify_name_first = '调研纪要' , classify_name_second = '黑色调研' ,1=1 ) 
-			AND IF ( classify_name_first = '宏观报告' , classify_name_second = '宏观G2观察' ,1=1 ) 
-			AND IF ( classify_name_first = '宏观报告' , classify_name_second = '人民币汇率双周报' ,1=1 ) 
-			AND IF ( classify_name_first = '宏观报告' , classify_name_second = '房地产市场跟踪' ,1=1 ) 
-			AND IF ( classify_name_first = '宏观报告' , classify_name_second = '黄金月报' ,1=1 ) 
-			AND IF ( classify_name_first = '数据点评' , classify_name_second = '铜行业数据点评' ,1=1 ) 
-			AND IF ( classify_name_first = '数据点评' , classify_name_second = '原油基本面推演' ,1=1 ) 
-			AND IF ( classify_name_first = '数据点评' , classify_name_second = '原油船期数据跟踪' ,1=1 ) 
-			AND IF ( classify_name_first = '数据点评' , classify_name_second = 'EIA原油库存点评' ,1=1 ) ` + condition + ` ORDER BY  modify_time	 DESC   `
+			AND IF ( classify_name_first = '数据点评' , classify_name_second  IN  ('铜行业数据点评','原油基本面推演','原油船期数据跟踪','EIA原油库存点评',)  ,1=1 ) ` + condition + ` ORDER BY  modify_time	 DESC   `
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }