fix

controllers/home.go

@@ -416,9 +416,9 @@ func (this *MobileHomeController) NewList() {
 
 		if tagIds != "" {
 			if tagArticleIds != "" {
-				condition = ` AND ((source = 'article' AND source_id IN (` + tagArticleIds + `)` + conditionInit + ` ) `
+				condition = ` AND ((source = 'article' AND source_id IN (` + tagArticleIds + `) ) `
 				if tagActivityIds != "" && lenActivityIds > 0 {
-					condition += ` OR (source = 'activity' AND source_id IN (` + tagActivityIds + `) AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `) ` + conditionInit + `)) `
+					condition += ` OR (source = 'activity' AND source_id IN (` + tagActivityIds + `) AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `) )) `
 					pars = append(pars, activityIds)
 				} else {
 					// 无可见活动
@@ -427,7 +427,7 @@ func (this *MobileHomeController) NewList() {
 			} else if tagActivityIds != "" {
 				condition = ` AND ((source = 'article' AND source_id IN (0))  `
 				if tagActivityIds != "" && lenActivityIds > 0 {
-					condition += ` OR (source = 'activity' AND source_id IN (` + tagActivityIds + `) AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `) ` + conditionInit + `)) `
+					condition += ` OR (source = 'activity' AND source_id IN (` + tagActivityIds + `) AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `))) `
 					pars = append(pars, activityIds)
 				} else {
 					// 无可见活动

models/article.go

@@ -346,12 +346,17 @@ func GetCygxCygxArticleListByCondition(articleTypesCond, activityTypesCond, indu
 				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=ias.industrial_subject_id  `
 	}
 	artSql += ` WHERE 1=1 `
-	artSql += articleTypesCond + industriesCond + subjectNamesCond
-	err = o.Raw(artSql).QueryRow(&artIds)
+	if articleTypesCond != "" {
+		artSql += articleTypesCond + industriesCond + subjectNamesCond
+		err = o.Raw(artSql).QueryRow(&artIds)
+	}
+
 
 	actSql += ` WHERE 1=1 `
-	actSql += activityTypesCond + industriesCond + subjectNamesCond
-	err = o.Raw(actSql).QueryRow(&actIds)
+	if activityTypesCond != "" {
+		actSql += activityTypesCond + industriesCond + subjectNamesCond
+		err = o.Raw(actSql).QueryRow(&actIds)
+	}
 
 	return
 }