|
@@ -307,14 +307,21 @@ func (this *MobileHomeController) NewList() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- activityTypes = strings.TrimRight(activityTypes,",")
|
|
|
articleTypes = strings.TrimRight(articleTypes,",")
|
|
|
+ activityTypes = strings.TrimRight(activityTypes,",")
|
|
|
industries = strings.TrimRight(industries,",")
|
|
|
subjectNames = strings.TrimRight(subjectNames,",")
|
|
|
|
|
|
articleTypesCond := ``
|
|
|
if articleTypes != "" {
|
|
|
- articleTypesCond += ` AND art.sub_category_name In (`+ articleTypes +`) `
|
|
|
+ articleTypeSlice := strings.Split(articleTypes, ",")
|
|
|
+ newArticleTypeSlice := make([]string,0)
|
|
|
+ for _, s := range articleTypeSlice {
|
|
|
+ newArticleTypeSlice = append(newArticleTypeSlice, "'"+ s + "'")
|
|
|
+ }
|
|
|
+ articleTypeStr := strings.Join(newArticleTypeSlice, ",")
|
|
|
+ articleTypeStr = strings.TrimRight(articleTypeStr,",")
|
|
|
+ articleTypesCond += ` AND art.sub_category_name In (`+ articleTypeStr +`) `
|
|
|
}
|
|
|
//activityTypesCond := ``
|
|
|
//if activityTypes != "" {
|
|
@@ -322,11 +329,25 @@ func (this *MobileHomeController) NewList() {
|
|
|
//}
|
|
|
industriesCond := ``
|
|
|
if industries != "" {
|
|
|
- industriesCond += ` AND im.industry_name In (`+ industries +`) `
|
|
|
+ industrieSlice := strings.Split(industries, ",")
|
|
|
+ newIndustrieSlice := make([]string,0)
|
|
|
+ for _, s := range industrieSlice {
|
|
|
+ newIndustrieSlice = append(newIndustrieSlice, "'"+ s + "'")
|
|
|
+ }
|
|
|
+ industrieStr := strings.Join(newIndustrieSlice, ",")
|
|
|
+ industrieStr = strings.TrimRight(industrieStr, ",")
|
|
|
+ industriesCond += ` AND im.industry_name In (`+ industrieStr +`) `
|
|
|
}
|
|
|
subjectNamesCond := ``
|
|
|
if subjectNames != "" {
|
|
|
- subjectNamesCond += ` AND is.subject_name In (`+ subjectNames +`) `
|
|
|
+ subjectNameSlice := strings.Split(subjectNames, ",")
|
|
|
+ newSubjectNameSlice := make([]string,0)
|
|
|
+ for _, s := range subjectNameSlice {
|
|
|
+ newSubjectNameSlice = append(newSubjectNameSlice, "'"+ s + "'")
|
|
|
+ }
|
|
|
+ subjectNameStr := strings.Join(newSubjectNameSlice, ",")
|
|
|
+ subjectNameStr = strings.TrimRight(subjectNameStr, ",")
|
|
|
+ subjectNamesCond += ` AND cis.subject_name In (`+ subjectNameStr +`) `
|
|
|
}
|
|
|
|
|
|
articleIntIds, err := models.GetCygxCygxArticleListByCondition(articleTypesCond, industriesCond, subjectNamesCond)
|