|
@@ -712,7 +712,7 @@ func (this *HomeController) NewList() {
|
|
|
|
|
|
articleTypesCond := ``
|
|
|
if articleTypes != "" {
|
|
|
- articleTypesCond += ` AND sub_category_name In (`+ activityTypes +`) `
|
|
|
+ articleTypesCond += ` AND sub_category_name In (`+ activityTypes +`) OR type_name IN (`+ activityTypes +`) OR article_type_name IN (`+ activityTypes +`) `
|
|
|
}
|
|
|
activityTypesCond := ``
|
|
|
if activityTypes != "" {
|
|
@@ -720,11 +720,11 @@ func (this *HomeController) NewList() {
|
|
|
}
|
|
|
industriesCond := ``
|
|
|
if industries != "" {
|
|
|
- industriesCond += ` AND sub_category_name In (`+ activityTypes +`) `
|
|
|
+ industriesCond += ` AND cygx_industrial_article_group_management In (`+ activityTypes +`) `
|
|
|
}
|
|
|
subjectNamesCond := ``
|
|
|
if subjectNames != "" {
|
|
|
- subjectNamesCond += ` AND sub_category_name In (`+ activityTypes +`) `
|
|
|
+ subjectNamesCond += ` AND cygx_industrial_article_group_subject In (`+ activityTypes +`) `
|
|
|
}
|
|
|
|
|
|
//condition += " AND source = 'article' "
|