fix

controllers/home.go

@@ -712,7 +712,7 @@ func (this *HomeController) NewList() {
 
 	articleTypesCond := ``
 	if articleTypes != "" {
-		articleTypesCond += ` AND art.sub_category_name In (`+ activityTypes +`) `
+		articleTypesCond += ` AND art.sub_category_name In (`+ articleTypes +`) `
 	}
 	//activityTypesCond := ``
 	//if activityTypes != "" {
@@ -720,11 +720,11 @@ func (this *HomeController) NewList() {
 	//}
 	industriesCond := ``
 	if industries != "" {
-		industriesCond += ` AND sub_category_name In (`+ activityTypes +`) `
+		industriesCond += ` AND im.industry_name In (`+ industries +`) `
 	}
 	subjectNamesCond := ``
 	if subjectNames != "" {
-		subjectNamesCond += ` AND sub_category_name In (`+ activityTypes +`) `
+		subjectNamesCond += ` AND is.subject_name In (`+ subjectNames +`) `
 	}
 
 	articleIntIds, err := models.GetCygxCygxArticleListByCondition(articleTypesCond, industriesCond, subjectNamesCond)

models/article.go

@@ -761,10 +761,12 @@ func GetCygxCygxArticleListByCondition(articleTypesCond, industriesCond, subject
 
 
 	if industriesCond != ""{
-		sql += ` INNER JOIN cygx_industrial_article_group_subject  AS asm ON asm.cygx_article_id = art.id `
+		sql += ` INNER JOIN cygx_industrial_article_group_management  AS iam ON iam.cygx_article_id = art.id 
+				INNER JOIN cygx_industrial_management AS im ON im.industrial_management_id=iam.industrial_management_id  `
 	}
 	if subjectNamesCond != ""{
-		sql += ` INNER JOIN cygx_industrial_article_group_subject  AS asm ON asm.cygx_article_id = art.id `
+		sql += ` INNER JOIN cygx_industrial_article_group_subject  AS ias ON ias.cygx_article_id = art.id 
+				INNER JOIN cygx_industrial_subject AS is ON is.industrial_subject_id=ias.industrial_subject_id  `
 	}
 	sql += ` WHERE 1=1 `