no message

models/report.go

@@ -377,22 +377,7 @@ type IndustrialPublishdate struct {
 //标的列表
 func GetTimeLineReportIndustrialPublishdateList(industrialIdArr []int) (items []*IndustrialPublishdate, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT
-			a.id,
-			a.article_id,
-			man_g.industrial_management_id AS industrial_management_id,
-			a.title,
-			a.publish_date 
-		FROM
-			cygx_article AS a
-			INNER JOIN cygx_industrial_article_group_management AS man_g ON man_g.article_id = a.article_id 
-		WHERE
-			a.publish_status = 1 
-			AND a.is_class = 1 
-			AND man_g.industrial_management_id IN(` + utils.GetOrmInReplace(len(industrialIdArr)) + `)
-		GROUP BY industrial_management_id 
-		UNION ALL
-		SELECT	
+	sql := `SELECT	
 			mmc.id,
 			0,
 			mmc.industry_id AS industrial_management_id,			
@@ -405,8 +390,7 @@ func GetTimeLineReportIndustrialPublishdateList(industrialIdArr []int) (items []
 			mm.id = mmc.meeting_id 
 			AND mm.STATUS = 1 
 			AND mmc.industry_id IN (` + utils.GetOrmInReplace(len(industrialIdArr)) + `)
-		GROUP BY industrial_management_id 
-		ORDER BY publish_date DESC  `
-	_, err = o.Raw(sql, industrialIdArr, industrialIdArr).QueryRows(&items)
+		GROUP BY industrial_management_id ORDER BY publish_data DESC  `
+	_, err = o.Raw(sql, industrialIdArr).QueryRows(&items)
 	return
 }