Merge branch 'cygx_11.1.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/home.go

@@ -922,12 +922,12 @@ func (this *HomeController) NewList() {
 		//	}
 		//}
 
-		if lenActivityIds > 0 && tagIds == "" {
+		if lenActivityIds > 0 {
 			condition += ` OR ( source = 'activity' AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `) ` + conditionInit + ` )    `
 			pars = append(pars, activityIds)
 		}
 
-		if lenActivityspecialIds > 0 && tagIds == "" {
+		if lenActivityspecialIds > 0 {
 			condition += ` OR ( source = 'activityspecial' AND source_id IN (` + utils.GetOrmInReplace(lenActivityspecialIds) + `) ` + conditionInit + ` )   `
 			pars = append(pars, activityspecialIds)
 		}

services/tag.go

@@ -65,16 +65,30 @@ func GetConditionInitByTagIds(tagIds string) (conditionInit string, err error) {
 	for _, tagInfo := range listTag {
 		//ActivityTypes 与 ArticleTypes 进行合并
 		if tagInfo.ActivityTypes != "" {
-			searchTag = append(searchTag, tagInfo.ActivityTypes)
+			sliceObj := strings.Split(tagInfo.ActivityTypes, ",")
+			for _, v := range sliceObj {
+				searchTag = append(searchTag, v)
+			}
 		}
 		if tagInfo.ArticleTypes != "" {
-			searchTag = append(searchTag, tagInfo.ArticleTypes)
+			sliceObj := strings.Split(tagInfo.ArticleTypes, ",")
+			for _, v := range sliceObj {
+				searchTag = append(searchTag, v)
+			}
 		}
 		if tagInfo.Industries != "" {
-			industries = append(industries, tagInfo.Industries)
+			sliceObj := strings.Split(tagInfo.Industries, ",")
+			for _, v := range sliceObj {
+				industries = append(industries, v)
+			}
+			//industries = append(industries, tagInfo.Industries)
 		}
 		if tagInfo.SubjectNames != "" {
-			subjectNames = append(subjectNames, tagInfo.SubjectNames)
+			sliceObj := strings.Split(tagInfo.SubjectNames, ",")
+			for _, v := range sliceObj {
+				subjectNames = append(subjectNames, v)
+			}
+			//subjectNames = append(subjectNames, tagInfo.SubjectNames)
 		}
 	}