fix

controllers/home.go

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