产业报告对应文章查询优化

models/report.go

@@ -44,9 +44,15 @@ FROM
 	INNER JOIN cygx_industrial_article_group_management as man_g ON man_g.article_id = a.article_id
 WHERE
 	a.publish_status = 1 
-	AND category_id  = ?
+	AND category_id IN (SELECT
+	category_id 
+FROM
+	cygx_report_mapping 
+WHERE
+	chart_permission_id = ( SELECT chart_permission_id FROM cygx_report_mapping WHERE category_id = ` + strconv.Itoa(categoryId) + ` ) 
+	AND match_type_name = ( SELECT match_type_name FROM cygx_report_mapping WHERE category_id = ` + strconv.Itoa(categoryId) + ` ) )
 	AND man_g.industrial_management_id = ?`
-	err = o.Raw(sql, categoryId, industrialManagementId).QueryRow(&count)
+	err = o.Raw(sql, industrialManagementId).QueryRow(&count)
 	return
 }
 
@@ -59,10 +65,16 @@ FROM
 	INNER JOIN cygx_industrial_article_group_management as man_g ON man_g.article_id = a.article_id
 WHERE
 	a.publish_status = 1 
-	AND category_id  = ?
+	AND category_id  IN (SELECT
+	category_id 
+FROM
+	cygx_report_mapping 
+WHERE
+	chart_permission_id = ( SELECT chart_permission_id FROM cygx_report_mapping WHERE category_id = ` + strconv.Itoa(categoryId) + ` ) 
+	AND match_type_name = ( SELECT match_type_name FROM cygx_report_mapping WHERE category_id = ` + strconv.Itoa(categoryId) + ` ) )
 	AND man_g.industrial_management_id = ?`
 	sql += ` ORDER BY publish_date DESC LIMIT ?,? `
-	_, err = o.Raw(sql, pars, categoryId, industrialManagementId, startSize, pageSize).QueryRows(&items)
+	_, err = o.Raw(sql, pars, industrialManagementId, startSize, pageSize).QueryRows(&items)
 	return
 }
 

utils/config.go

@@ -74,7 +74,7 @@ func init() {
 		WxPublicAppSecret = "26c586e7ccb3c575433f0f37797b3eeb"
 		WxPublicId = "gh_b67e0049fb8c"
 		//IndexName="cygx_article_v1"
-		IndexName="cygx_article_v2"
+		IndexName = "cygx_article_v2"
 	} else {
 		WxAppId = "wxcc32b61f96720d2f"
 		WxAppSecret = "06894933fafb24dafead7eaae09c08e0"
@@ -88,7 +88,7 @@ func init() {
 		WxPublicAppId = "wx9b5d7291e581233a"
 		WxPublicAppSecret = "f4d52e34021eee262dce9682b31f8861"
 		WxPublicId = "gh_5dc508325c6f"
-		IndexName="test_article"
+		IndexName = "test_article"
 	}
 }